11 files changed, 29 insertions, 30 deletions
diff --git a/src/doc/unstable-book/src/language-features/non-ascii-idents.md b/src/doc/unstable-book/src/language-features/non-ascii-idents.md
index efb5495fe26..46957c00bf9 100644
--- a/src/doc/unstable-book/src/language-features/non-ascii-idents.md
+++ b/src/doc/unstable-book/src/language-features/non-ascii-idents.md
@@ -1,8 +1,8 @@
 # `non_ascii_idents`
 
-The tracking issue for this feature is: [#28979]
+The tracking issue for this feature is: [#55467]
 
-[#28979]: https://github.com/rust-lang/rust/issues/28979
+[#55467]: https://github.com/rust-lang/rust/issues/55467
 
 ------------------------
 
diff --git a/src/libcore/pin.rs b/src/libcore/pin.rs
index d8508631bf9..e31ac691e3a 100644
--- a/src/libcore/pin.rs
+++ b/src/libcore/pin.rs
@@ -25,7 +25,7 @@
 //! values.
 //!
 //! However, these restrictions are usually not necessary. Many types are always freely
-//! movable. These types implement the [`Unpin`] auto-trait, which nullifies the affect
+//! movable. These types implement the [`Unpin`] auto-trait, which nullifies the effect
 //! of [`Pin`]. For `T: Unpin`, `Pin<Box<T>>` and `Box<T>` function identically, as do
 //! `Pin<&mut T>` and `&mut T`.
 //!
diff --git a/src/libcore/ptr.rs b/src/libcore/ptr.rs
index b9420f32a94..55a72d7a9a9 100644
--- a/src/libcore/ptr.rs
+++ b/src/libcore/ptr.rs
@@ -591,7 +591,7 @@ pub unsafe fn read<T>(src: *const T) -> T {
 /// 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].
 ///
-/// Note that even if `T` has size `0`, the pointer must be non-NULL and properly aligned.
+/// Note that even if `T` has size `0`, the pointer must be non-NULL.
 ///
 /// [`Copy`]: ../marker/trait.Copy.html
 /// [`read`]: ./fn.read.html
@@ -759,7 +759,7 @@ pub unsafe fn write<T>(dst: *mut T, src: T) {
 ///
 /// * `dst` must be [valid] for writes.
 ///
-/// Note that even if `T` has size `0`, the pointer must be non-NULL and properly aligned.
+/// Note that even if `T` has size `0`, the pointer must be non-NULL.
 ///
 /// [valid]: ../ptr/index.html#safety
 ///
diff --git a/src/librustc_borrowck/borrowck/README.md b/src/librustc_borrowck/borrowck/README.md
index a05c56e3629..6c47e8784e0 100644
--- a/src/librustc_borrowck/borrowck/README.md
+++ b/src/librustc_borrowck/borrowck/README.md
@@ -3,7 +3,7 @@
 > WARNING: This README is more or less obsolete, and will be removed
 > soon! The new system is described in 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
 
 This pass has the job of enforcing memory safety. This is a subtle
 topic. This docs aim to explain both the practice and the theory
diff --git a/src/librustdoc/html/static/down-arrow.svg b/src/librustdoc/html/static/down-arrow.svg
index a2d9a37dde0..c0f59f0c36f 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="0 0 128 128" 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
+<?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
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index aa4278a8799..6ded43dfed1 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -248,7 +248,6 @@
 #![feature(const_cstr_unchecked)]
 #![feature(core_intrinsics)]
 #![feature(dropck_eyepatch)]
-#![cfg_attr(stage0, feature(duration_as_u128))]
 #![feature(exact_size_is_empty)]
 #![feature(external_doc)]
 #![feature(fixed_size_array)]
diff --git a/src/libstd/primitive_docs.rs b/src/libstd/primitive_docs.rs
index 27e720533b2..7755d9339e6 100644
--- a/src/libstd/primitive_docs.rs
+++ b/src/libstd/primitive_docs.rs
@@ -302,7 +302,7 @@ mod prim_never { }
 /// ```text
 /// error: character literal may only contain one codepoint: 'é'
 /// let c = 'é';
-///         ^^^^
+///         ^^^
 /// ```
 ///
 /// Another implication of the 4-byte fixed size of a `char` is that
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs
index 70df403d0c2..be49c55a54c 100644
--- a/src/libsyntax/feature_gate.rs
+++ b/src/libsyntax/feature_gate.rs
@@ -111,7 +111,7 @@ declare_features! (
     (active, concat_idents, "1.0.0", Some(29599), None),
     (active, link_args, "1.0.0", Some(29596), None),
     (active, log_syntax, "1.0.0", Some(29598), None),
-    (active, non_ascii_idents, "1.0.0", Some(28979), None),
+    (active, non_ascii_idents, "1.0.0", Some(55467), None),
     (active, plugin_registrar, "1.0.0", Some(29597), None),
     (active, thread_local, "1.0.0", Some(29594), None),
     (active, trace_macros, "1.0.0", Some(29598), None),
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 452a3ecfacd..5c441189ea7 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
@@ -1,4 +1,4 @@
-error[E0658]: non-ascii idents are not fully supported. (see issue #28979)
+error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
   --> $DIR/feature-gate-non_ascii_idents.rs:1:22
    |
 LL | extern crate core as bäz; //~ ERROR non-ascii idents
@@ -6,7 +6,7 @@ LL | extern crate core as bäz; //~ ERROR non-ascii idents
    |
    = help: add #![feature(non_ascii_idents)] to the crate attributes to enable
 
-error[E0658]: non-ascii idents are not fully supported. (see issue #28979)
+error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
   --> $DIR/feature-gate-non_ascii_idents.rs:3:5
    |
 LL | use föö::bar; //~ ERROR non-ascii idents
@@ -14,7 +14,7 @@ LL | use föö::bar; //~ ERROR non-ascii idents
    |
    = help: add #![feature(non_ascii_idents)] to the crate attributes to enable
 
-error[E0658]: non-ascii idents are not fully supported. (see issue #28979)
+error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
   --> $DIR/feature-gate-non_ascii_idents.rs:5:5
    |
 LL | mod föö { //~ ERROR non-ascii idents
@@ -22,7 +22,7 @@ LL | mod föö { //~ ERROR non-ascii idents
    |
    = help: add #![feature(non_ascii_idents)] to the crate attributes to enable
 
-error[E0658]: non-ascii idents are not fully supported. (see issue #28979)
+error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
   --> $DIR/feature-gate-non_ascii_idents.rs:9:4
    |
 LL | fn bär( //~ ERROR non-ascii idents
@@ -30,7 +30,7 @@ LL | fn bär( //~ ERROR non-ascii idents
    |
    = help: add #![feature(non_ascii_idents)] to the crate attributes to enable
 
-error[E0658]: non-ascii idents are not fully supported. (see issue #28979)
+error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
   --> $DIR/feature-gate-non_ascii_idents.rs:10:5
    |
 LL |     bäz: isize //~ ERROR non-ascii idents
@@ -38,7 +38,7 @@ LL |     bäz: isize //~ ERROR non-ascii idents
    |
    = help: add #![feature(non_ascii_idents)] to the crate attributes to enable
 
-error[E0658]: non-ascii idents are not fully supported. (see issue #28979)
+error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
   --> $DIR/feature-gate-non_ascii_idents.rs:12:9
    |
 LL |     let _ö: isize; //~ ERROR non-ascii idents
@@ -46,7 +46,7 @@ LL |     let _ö: isize; //~ ERROR non-ascii idents
    |
    = help: add #![feature(non_ascii_idents)] to the crate attributes to enable
 
-error[E0658]: non-ascii idents are not fully supported. (see issue #28979)
+error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
   --> $DIR/feature-gate-non_ascii_idents.rs:15:10
    |
 LL |         (_ä, _) => {} //~ ERROR non-ascii idents
@@ -54,7 +54,7 @@ LL |         (_ä, _) => {} //~ ERROR non-ascii idents
    |
    = help: add #![feature(non_ascii_idents)] to the crate attributes to enable
 
-error[E0658]: non-ascii idents are not fully supported. (see issue #28979)
+error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
   --> $DIR/feature-gate-non_ascii_idents.rs:19:8
    |
 LL | struct Föö { //~ ERROR non-ascii idents
@@ -62,7 +62,7 @@ LL | struct Föö { //~ ERROR non-ascii idents
    |
    = help: add #![feature(non_ascii_idents)] to the crate attributes to enable
 
-error[E0658]: non-ascii idents are not fully supported. (see issue #28979)
+error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
   --> $DIR/feature-gate-non_ascii_idents.rs:20:5
    |
 LL |     föö: isize //~ ERROR non-ascii idents
@@ -70,7 +70,7 @@ LL |     föö: isize //~ ERROR non-ascii idents
    |
    = help: add #![feature(non_ascii_idents)] to the crate attributes to enable
 
-error[E0658]: non-ascii idents are not fully supported. (see issue #28979)
+error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
   --> $DIR/feature-gate-non_ascii_idents.rs:23:6
    |
 LL | enum Bär { //~ ERROR non-ascii idents
@@ -78,7 +78,7 @@ LL | enum Bär { //~ ERROR non-ascii idents
    |
    = help: add #![feature(non_ascii_idents)] to the crate attributes to enable
 
-error[E0658]: non-ascii idents are not fully supported. (see issue #28979)
+error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
   --> $DIR/feature-gate-non_ascii_idents.rs:24:5
    |
 LL |     Bäz { //~ ERROR non-ascii idents
@@ -86,7 +86,7 @@ LL |     Bäz { //~ ERROR non-ascii idents
    |
    = help: add #![feature(non_ascii_idents)] to the crate attributes to enable
 
-error[E0658]: non-ascii idents are not fully supported. (see issue #28979)
+error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
   --> $DIR/feature-gate-non_ascii_idents.rs:25:9
    |
 LL |         qüx: isize //~ ERROR non-ascii idents
@@ -94,7 +94,7 @@ LL |         qüx: isize //~ ERROR non-ascii idents
    |
    = help: add #![feature(non_ascii_idents)] to the crate attributes to enable
 
-error[E0658]: non-ascii idents are not fully supported. (see issue #28979)
+error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
   --> $DIR/feature-gate-non_ascii_idents.rs:30:8
    |
 LL |     fn qüx();  //~ ERROR non-ascii idents
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 42ee68073fb..40cb10ced16 100644
--- a/src/test/ui/imports/local-modularized-tricky-fail-2.stderr
+++ b/src/test/ui/imports/local-modularized-tricky-fail-2.stderr
@@ -1,4 +1,4 @@
-error[E0658]: non-ascii idents are not fully supported. (see issue #28979)
+error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
   --> $DIR/local-modularized-tricky-fail-2.rs:20:32
    |
 LL | exported!();
@@ -9,7 +9,7 @@ LL |                 () => ( struct Б; ) //~ ERROR non-ascii idents are not ful
    |
    = help: add #![feature(non_ascii_idents)] to the crate attributes to enable
 
-error[E0658]: non-ascii idents are not fully supported. (see issue #28979)
+error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
   --> $DIR/local-modularized-tricky-fail-2.rs:36:24
    |
 LL |     panic!();
@@ -20,7 +20,7 @@ LL |         () => ( struct Г; ) //~ ERROR non-ascii idents are not fully suppo
    |
    = help: add #![feature(non_ascii_idents)] to the crate attributes to enable
 
-error[E0658]: non-ascii idents are not fully supported. (see issue #28979)
+error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
   --> $DIR/local-modularized-tricky-fail-2.rs:46:24
    |
 LL | include!();
diff --git a/src/test/ui/utf8_idents.stderr b/src/test/ui/utf8_idents.stderr
index 4279ed78d39..b1bb4a30015 100644
--- a/src/test/ui/utf8_idents.stderr
+++ b/src/test/ui/utf8_idents.stderr
@@ -1,4 +1,4 @@
-error[E0658]: non-ascii idents are not fully supported. (see issue #28979)
+error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
   --> $DIR/utf8_idents.rs:4:5
    |
 LL |     'β, //~ ERROR non-ascii idents are not fully supported
@@ -6,7 +6,7 @@ LL |     'β, //~ ERROR non-ascii idents are not fully supported
    |
    = help: add #![feature(non_ascii_idents)] to the crate attributes to enable
 
-error[E0658]: non-ascii idents are not fully supported. (see issue #28979)
+error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
   --> $DIR/utf8_idents.rs:5:5
    |
 LL |     γ  //~ ERROR non-ascii idents are not fully supported
@@ -14,7 +14,7 @@ LL |     γ  //~ ERROR non-ascii idents are not fully supported
    |
    = help: add #![feature(non_ascii_idents)] to the crate attributes to enable
 
-error[E0658]: non-ascii idents are not fully supported. (see issue #28979)
+error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
   --> $DIR/utf8_idents.rs:9:5
    |
 LL |     δ: usize //~ ERROR non-ascii idents are not fully supported
@@ -22,7 +22,7 @@ LL |     δ: usize //~ ERROR non-ascii idents are not fully supported
    |
    = help: add #![feature(non_ascii_idents)] to the crate attributes to enable
 
-error[E0658]: non-ascii idents are not fully supported. (see issue #28979)
+error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
   --> $DIR/utf8_idents.rs:13:9
    |
 LL |     let α = 0.00001f64; //~ ERROR non-ascii idents are not fully supported