Skip to content

Commit 5f3cc2a

Browse files
authored
Merge pull request #152 from ehuss/mdbook2
Migrate to mdbook 0.2.
2 parents d26495b + dfb1beb commit 5f3cc2a

File tree

18 files changed

+23
-23
lines changed

18 files changed

+23
-23
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ You can also build the book and read it locally if you'd like.
1919

2020
### Requirements
2121

22-
Building the book requires [mdBook]. To get it:
22+
Building the book requires [mdBook] 0.2. To get it:
2323

2424
[mdBook]: https://github.com/azerupi/mdBook
2525

src/editions/transitioning-an-existing-project-to-a-new-edition.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ trait Foo {
2121
```
2222

2323
This code uses an anonymous parameter, that `Box<Foo>`. This is [not
24-
supported in Rust 2018](rust-2018/trait-system/no-anon-params.html), and
24+
supported in Rust 2018](../rust-2018/trait-system/no-anon-params.md), and
2525
so this would fail to compile. Let's get this code up to date!
2626

2727
## Updating your code to be compatible with the new edition
@@ -89,7 +89,7 @@ trait Foo {
8989
```
9090

9191
In Rust 2018, it's considered idiomatic to use the [`dyn`
92-
keyword](rust-2018/trait-system/dyn-trait-for-trait-objects.html) for
92+
keyword](../rust-2018/trait-system/dyn-trait-for-trait-objects.md) for
9393
trait objects.
9494

9595
Eventually, we want `cargo fix` to fix all these idioms automatically in the same
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Cargo and crates.io
22

3-
[check]: rust-2018/cargo-and-crates-io/cargo-check-for-faster-checking.html
3+
[check]: cargo-check-for-faster-checking.md
44

55
In this chapter of the guide, we discuss a few improvements to `cargo` and crates.io.
66
A notable addition here is the new [`cargo check`][check] command.

src/rust-2018/control-flow/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Control flow
22

3-
[async_await]: rust-2018/control-flow/async-await-for-easier-concurrency.html
3+
[async_await]: async-await-for-easier-concurrency.md
44

55
In this chapter of the guide, we discuss a few improvements to control flow.
66
The most notable of these *will* be [`async` and `await`][async_await].

src/rust-2018/data-types/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Data types
22

3-
[fis]: rust-2018/data-types/field-init-shorthand.html
3+
[fis]: field-init-shorthand.md
44

55
In this chapter of the guide, we discuss a few improvements to data types.
66
One of these are [field-init-shorthand][fis].

src/rust-2018/documentation/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Documentation
22

3-
[sec_ed]: rust-2018/documentation/new-editions-of-the-book.html
3+
[sec_ed]: new-editions-of-the-book.md
44

55
In this chapter of the guide, we discuss a few improvements to documentation.
66
A notable addition here is the [second edition of "the book"][sec_ed].

src/rust-2018/edition-changes.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ the 2018 edition compared to the 2015 edition.
2626
- `cargo install` for the current directory is no longer allowed, you must
2727
specify `cargo install --path .` to install the current package.
2828

29-
[Anonymous trait function parameters]: rust-2018/trait-system/no-anon-params.html
30-
[At most once]: rust-2018/macros/at-most-once.html
31-
[Non-lexical lifetimes]: rust-2018/ownership-and-lifetimes/non-lexical-lifetimes.html
32-
[Path changes]: rust-2018/module-system/path-clarity.html
29+
[Anonymous trait function parameters]: trait-system/no-anon-params.md
30+
[At most once]: macros/at-most-once.md
31+
[Non-lexical lifetimes]: ownership-and-lifetimes/non-lexical-lifetimes.md
32+
[Path changes]: module-system/path-clarity.md
3333
[Trait function parameters]: https://doc.rust-lang.org/stable/reference/items/traits.html#parameter-patterns
34-
[`dyn`]: rust-2018/trait-system/dyn-trait-for-trait-objects.html
34+
[`dyn`]: trait-system/dyn-trait-for-trait-objects.md
3535
[reserved keywords]: https://doc.rust-lang.org/reference/keywords.html#reserved-keywords
3636
[strict keyword]: https://doc.rust-lang.org/reference/keywords.html#strict-keywords
3737
[tyvar_behind_raw_pointer]: https://github.com/rust-lang/rust/issues/46906
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Error handling and Panics
22

3-
[qop]: rust-2018/error-handling-and-panics/the-question-mark-operator-for-easier-error-handling.html
3+
[qop]: the-question-mark-operator-for-easier-error-handling.md
44

55
In this chapter of the guide, we discuss a few improvements to error handling
66
in Rust. The most notable of these is [the introduction of the `?` operator][qop].

src/rust-2018/macros/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Macros
22

3-
[custom-derive]: rust-2018/macros/custom-derive.html
3+
[custom-derive]: custom-derive.md
44

55
In this chapter of the guide, we discuss a few improvements to the macro system.
66
A notable addition here is the introduction of [custom derive macros][custom-derive].

src/rust-2018/module-system/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Module system
22

3-
[path clarity changes]: rust-2018/module-system/path-clarity.html
3+
[path clarity changes]: path-clarity.md
44

55
In this chapter of the guide, we discuss a few changes to the module system.
66
The most notable of these are the [path clarity changes].

src/rust-2018/module-system/path-clarity.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ Finally, on nightly, you'll need it for crates like:
8989
#### Macros
9090

9191
One other use for `extern crate` was to import macros; that's no longer needed.
92-
Check [the macro section](rust-2018/macros/macro-changes.html) for more.
92+
Check [the macro section](../macros/macro-changes.md) for more.
9393

9494
If you've been using `as` to rename your crate like this:
9595

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Ownership and lifetimes
22

3-
[dmbm]: rust-2018/ownership-and-lifetimes/default-match-bindings.html
3+
[dmbm]: default-match-bindings.md
44

55
In this chapter of the guide, we discuss a few improvements to ownership and lifetimes.
66
One of the most notable of these is [default match binding modes][dmbm].

src/rust-2018/ownership-and-lifetimes/lifetime-elision-in-impl.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,4 +72,4 @@ impl<T> Drop for SetOnDrop<'_, T> {
7272
}
7373
```
7474

75-
[the anonymous lifetime]: rust-2018/ownership-and-lifetimes/the-anonymous-lifetime.html
75+
[the anonymous lifetime]: the-anonymous-lifetime.md
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Platform and target support
22

3-
[libcore]: rust-2018/platform-and-target-support/libcore-for-low-level-rust.html
3+
[libcore]: libcore-for-low-level-rust.md
44

55
In this chapter of the guide, we discuss a few improvements to platform and target support.
66
A notable addition to it was [that the `libcore` library now works on stable Rust][libcore].

src/rust-2018/rustdoc/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# `rustdoc`
22

3-
[cf]: rust-2018/rustdoc/documentation-tests-can-now-compile-fail.html
3+
[cf]: documentation-tests-can-now-compile-fail.md
44

55
In this chapter of the guide, we discuss a few improvements to `rustdoc`.
66
A notable addition to it was [that documentation tests can now compile-fail][cf].

src/rust-2018/the-compiler/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# The compiler
22

3-
[errors]: rust-2018/the-compiler/improved-error-messages.html
3+
[errors]: improved-error-messages.md
44

55
In this chapter of the guide, we discuss a few improvements to the compiler.
66
A notable addition here is our new and [improved error messages][errors].

src/rust-2018/trait-system/dyn-trait-for-trait-objects.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ is sometimes slower, and often cannot be used at all when its alternatives can.
3636

3737
Furthermore, with `impl Trait` arriving, "`impl Trait` vs `dyn Trait`" is much
3838
more symmetric, and therefore a bit nicer, than "`impl Trait` vs `Trait`".
39-
`impl Trait` is explained [here](rust-2018/trait-system/impl-trait-for-returning-complex-types-with-ease.html)
39+
`impl Trait` is explained [here](impl-trait-for-returning-complex-types-with-ease.md)
4040

4141
In the new edition, you should therefore prefer `dyn Trait` to just `Trait`
4242
where you need a trait object.

src/rust-2018/trait-system/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Trait system
22

3-
[impl_trait]: rust-2018/trait-system/impl-trait-for-returning-complex-types-with-ease.html
3+
[impl_trait]: impl-trait-for-returning-complex-types-with-ease.md
44

55
In this chapter of the guide, we discuss a few improvements to the trait system.
66
The most notable of these is [`impl Trait`][impl_trait].

0 commit comments

Comments
 (0)