Merge pull request rust-lang#88 from mbrubeck/links

Fix some broken links

src/SUMMARY.md

@@ -53,6 +53,7 @@
     - [Choosing alignment with the `repr` attribute](rust-2018/choosing-alignment-with-the-repr-attribute.md)
     - [`cargo new` defaults to a binary project](rust-2018/cargo-new-defaults-to-a-binary-project.md)
     - [`impl Trait` for returning complex types with ease](rust-2018/impl-trait-for-returning-complex-types-with-ease.md)
+    - [`?` in `main` and tests](rust-2018/question-mark-in-main-and-tests.md)
     - [Default `match` bindings](rust-2018/default-match-bindings.md)
     - [`..=` for inclusive ranges](rust-2018/inclusive-ranges.md)
     - [Slice patterns](rust-2018/slice-patterns.md)
@@ -68,4 +69,4 @@
     - [Path clarity](rust-2018/path-clarity.md)
     - [`async`/`await` for easier concurrency](rust-2018/async-await-for-easier-concurrency.md)
 
-- [Unstable feature status](unstable-feature-status.md)
+- [Unstable feature status](unstable-feature-status.md)

src/editions/transitioning-your-code-to-a-new-edition.md

@@ -55,7 +55,7 @@ your `lib.rs` or `main.rs`:
 The release of Rust 2018 will stabilize one of the two module path variants and
 drop the other.
 
-[status]: 2018/status.html
+[status]: ../unstable-feature-status.html
 
 ## Fix edition compatibility warnings
 

src/unstable-feature-status.md

@@ -5,24 +5,23 @@
 [Shipped, 1.26]: https://blog.rust-lang.org/2018/05/10/Rust-1.26.html
 [Shipped, 1.27]: https://blog.rust-lang.org/2018/06/21/Rust-1.27.html
 
-[`impl Trait`]: transitioning/traits/impl-trait.html
-[Basic slice patterns]: transitioning/slice-patterns.html
-[Default match bindings]: transitioning/ownership-and-lifetimes/default-match-bindings.html
-[Anonymous lifetimes]: transitioning/ownership-and-lifetimes/anonymous-lifetime.html
+[`impl Trait`]: rust-2018/impl-trait-for-returning-complex-types-with-ease.html
+[Basic slice patterns]: rust-2018/slice-patterns.html
+[Default match bindings]: rust-2018/default-match-bindings.html
+[Anonymous lifetimes]: rust-2018/the-anonymous-lifetime.html
 [relnotes_1.26]: https://github.com/rust-lang/rust/blob/master/RELEASES.md#version-1260-2018-05-10
-[`dyn Trait`]: transitioning/traits/dyn-trait.html
-[`?` in `main`/tests]: transitioning/errors/question-mark.html
-[Module system path changes]: transitioning/modules/path-clarity.html
+[`dyn Trait`]: rust-2018/dyn-trait-for-trait-objects.html
+[`?` in `main`/tests]: rust-2018/question-mark-in-main-and-tests.html
+[Module system path changes]: rust-2018/path-clarity.html
 [issue#44660]: https://github.com/rust-lang/rust/issues/44660
-[Import macros via `use`]: transitioning/modules/macros.html
+[Import macros via `use`]: rust-2018/macro-changes.html
 [issue#35896]: https://github.com/rust-lang/rust/issues/35896
-[In-band lifetimes]: transitioning/ownership-and-lifetimes/in-band-lifetimes.html
 [issue#44524]: https://github.com/rust-lang/rust/issues/44524
-[Lifetime elision in `impl`s]: transitioning/ownership-and-lifetimes/lifetime-elision-in-impl.html
-[Raw identifiers]: transitioning/raw-identifiers.html
+[Lifetime elision in `impl`s]: rust-2018/lifetime-elision-in-impl.html
+[Raw identifiers]: rust-2018/raw-identifiers.html
 [issue#48589]: https://github.com/rust-lang/rust/issues/48589
 [nll_status]: http://smallcultfollowing.com/babysteps/blog/2018/06/15/mir-based-borrow-check-nll-status-update/
-[`T: 'a` inference in `struct`s]: transitioning/ownership-and-lifetimes/struct-inference.html
+[`T: 'a` inference in `struct`s]: rust-2018/inference-in-structs.html
 [issue#44493]: https://github.com/rust-lang/rust/issues/44493
 
 | **Feature** | **Status** | **Minimum Edition** |
@@ -34,7 +33,7 @@
 | [`dyn Trait`] | [Shipped, 1.27] | 2015 |
 | SIMD support | [Shipped, 1.27] | 2015 |
 | [`?` in `main`/tests] | [Shipping, 1.26][Shipped, 1.26] and 1.28 | 2015 |
-| [In-band lifetimes] | Unstable; [tracking issue][issue#44524] | 2015 |
+| In-band lifetimes | Unstable; [tracking issue][issue#44524] | 2015 |
 | [Lifetime elision in `impl`s] | Unstable; [tracking issue][issue#44524] | 2015 |
 | Non-lexical lifetimes | [Implemented but not ready for preview][nll_status] | 2015 |
 | [`T: 'a` inference in `struct`s] | Unstable; [tracking issue][issue#44493] | 2015 |