Merge pull request #1199 from mati865/mdbook2

Upgrade links to match mdbook 0.2
rust-lang · Jun 8, 2019 · d8eec1d · d8eec1d
2 parents 18566f4 + 809776f
commit d8eec1d
Show file tree

Hide file tree

Showing 77 changed files with 176 additions and 176 deletions.
diff --git a/src/attribute.md b/src/attribute.md
@@ -33,6 +33,6 @@ Attributes can have multiple values and can be separated over multiple lines, to
             value4, value5)]
 ```
 
-[cfg]: attribute/cfg.html
-[crate]: attribute/crate.html
+[cfg]: attribute/cfg.md
+[crate]: attribute/crate.md
 [lint]: https://en.wikipedia.org/wiki/Lint_%28software%29
diff --git a/src/attribute/cfg.md b/src/attribute/cfg.md
@@ -37,5 +37,5 @@ fn main() {
 [the reference][ref], [`cfg!`][cfg], and [macros][macros].
 
 [cfg]: https://doc.rust-lang.org/std/macro.cfg!.html
-[macros]: macros.html
+[macros]: ../macros.md
 [ref]: https://doc.rust-lang.org/reference/attributes.html#conditional-compilation
diff --git a/src/compatibility.md b/src/compatibility.md
@@ -4,4 +4,4 @@ The Rust language is fastly evolving, and because of this certain compatibility
 issues can arise, despite efforts to ensure forwards-compatibility wherever
 possible.
 
-* [Raw identifiers](compatibility/raw_identifiers.html)
+* [Raw identifiers](compatibility/raw_identifiers.md)
diff --git a/src/conversion.md b/src/conversion.md
@@ -5,6 +5,6 @@ conversions will use the [`From`] and [`Into`] traits. However there are more
 specific ones for the more common cases, in particular when converting to and
 from `String`s.
 
-[traits]: trait.html
+[traits]: trait.md
 [`From`]: https://doc.rust-lang.org/std/convert/trait.From.html
 [`Into`]: https://doc.rust-lang.org/std/convert/trait.Into.html
diff --git a/src/conversion/string.md b/src/conversion/string.md
@@ -50,6 +50,6 @@ fn main() {
 
 [`ToString`]: https://doc.rust-lang.org/std/string/trait.ToString.html
 [Display]: https://doc.rust-lang.org/std/fmt/trait.Display.html
-[print]: hello/print.html
+[print]: ../hello/print.md
 [`parse`]: https://doc.rust-lang.org/std/primitive.str.html#method.parse
 [`FromStr`]: https://doc.rust-lang.org/std/str/trait.FromStr.html
diff --git a/src/crates/lib.md b/src/crates/lib.md
@@ -28,4 +28,4 @@ Libraries get prefixed with "lib", and by default they get named after their
 crate file, but this default name can be overridden using the [`crate_name`
 attribute][crate-name].
 
-[crate-name]: attribute/crate.html
+[crate-name]: ../attribute/crate.md
diff --git a/src/custom_types/constants.md b/src/custom_types/constants.md
@@ -38,5 +38,5 @@ fn main() {
 https://github.com/rust-lang/rfcs/blob/master/text/0246-const-vs-static.md),
 [`'static` lifetime][static]
 
-[static]: scope/lifetime/static_lifetime.html
-[unsafe]: unsafe.html
+[static]: ../scope/lifetime/static_lifetime.md
+[unsafe]: ../unsafe.md
diff --git a/src/custom_types/enum.md b/src/custom_types/enum.md
@@ -58,6 +58,6 @@ fn main() {
 [`match`][match], [`fn`][fn], and [`String`][str]
 
 [c_struct]: https://en.wikipedia.org/wiki/Struct_(C_programming_language)
-[match]: flow_control/match.html
-[fn]: fn.html
-[str]: std/str.html
+[match]: ../flow_control/match.md
+[fn]: ../fn.md
+[str]: ../std/str.md
diff --git a/src/custom_types/enum/c_like.md b/src/custom_types/enum/c_like.md
@@ -34,4 +34,4 @@ fn main() {
 
 [casting][cast]
 
-[cast]: types/cast.html
+[cast]: ../../types/cast.md
diff --git a/src/custom_types/enum/enum_use.md b/src/custom_types/enum/enum_use.md
@@ -46,5 +46,5 @@ fn main() {
 
 [`match`][match] and [`use`][use] 
 
-[use]: mod/use.html
-[match]: flow_control/match.html
+[use]: ../../mod/use.md
+[match]: ../../flow_control/match.md
diff --git a/src/custom_types/enum/testcase_linked_list.md b/src/custom_types/enum/testcase_linked_list.md
@@ -75,5 +75,5 @@ fn main() {
 
 [`Box`][box] and [methods][methods]
 
-[box]: std/box.html
-[methods]: fn/methods.html
+[box]: ../../std/box.md
+[methods]: ../../fn/methods.md
diff --git a/src/custom_types/structs.md b/src/custom_types/structs.md
@@ -89,6 +89,6 @@ fn main() {
 
 [`attributes`][attributes] and [destructuring][destructuring]
 
-[attributes]: attribute.html
+[attributes]: ../attribute.md
 [c_struct]: https://en.wikipedia.org/wiki/Struct_(C_programming_language)
-[destructuring]: flow_control/match/destructuring.html
+[destructuring]: ../flow_control/match/destructuring.md
diff --git a/src/error/multiple_error_types/option_result.md b/src/error/multiple_error_types/option_result.md
@@ -55,4 +55,4 @@ fn main() {
 }
 ```
 
-[enter_question_mark]: error/result/enter_question_mark.html
+[enter_question_mark]: ../result/enter_question_mark.md
diff --git a/src/error/multiple_error_types/wrap_error.md b/src/error/multiple_error_types/wrap_error.md
@@ -83,4 +83,4 @@ for you.
 [`From::from`][from] and [`Enums`][enums]
 
 [from]: https://doc.rust-lang.org/std/convert/trait.From.html
-[enums]: custom_types/enum.html
+[enums]: ../../custom_types/enum.md
diff --git a/src/error/option_unwrap/and_then.md b/src/error/option_unwrap/and_then.md
@@ -71,6 +71,6 @@ fn main() {
 
 [closures][closures], [`Option`][option], and [`Option::and_then()`][and_then]
 
-[closures]: fn/closures.html
+[closures]: ../../fn/closures.md
 [option]: https://doc.rust-lang.org/std/option/enum.Option.html
 [and_then]: https://doc.rust-lang.org/std/option/enum.Option.html#method.and_then
diff --git a/src/error/option_unwrap/map.md b/src/error/option_unwrap/map.md
@@ -81,6 +81,6 @@ fn main() {
 [closures][closures], [`Option`][option], [`Option::map()`][map]
 
 [combinators]: https://doc.rust-lang.org/book/glossary.html#combinators
-[closures]: fn/closures.html
+[closures]: ../../fn/closures.md
 [option]: https://doc.rust-lang.org/std/option/enum.Option.html
 [map]: https://doc.rust-lang.org/std/option/enum.Option.html#method.map
diff --git a/src/error/result.md b/src/error/result.md
@@ -80,4 +80,4 @@ fn main() -> Result<(), ParseIntError> {
 [result]: https://doc.rust-lang.org/std/result/enum.Result.html
 [parse]: https://doc.rust-lang.org/std/primitive.str.html#method.parse
 [`Debug`]: https://doc.rust-lang.org/std/fmt/trait.Debug.html
-[the following section]: error/result/early_returns.html
+[the following section]: result/early_returns.md
diff --git a/src/error/result/enter_question_mark.md b/src/error/result/enter_question_mark.md
@@ -69,4 +69,4 @@ fn main() {
 
 [^†]: See [re-enter ?][re_enter_?] for more details.
 
-[re_enter_?]: error/multiple_error_types/reenter_question_mark.html
+[re_enter_?]: ../multiple_error_types/reenter_question_mark.md
diff --git a/src/error/result/result_alias.md b/src/error/result/result_alias.md
@@ -42,5 +42,5 @@ fn main() {
 
 [`io::Result`][io_result]
 
-[typealias]: types/alias.html
+[typealias]: ../../types/alias.md
 [io_result]: https://doc.rust-lang.org/std/io/type.Result.html
diff --git a/src/flow_control/for.md b/src/flow_control/for.md
@@ -117,4 +117,4 @@ implies differing actions that are able to be performed.
 
 [Iterator][iter]
 
-[iter]: trait/iter.html
+[iter]: ../trait/iter.md
diff --git a/src/flow_control/if_let.md b/src/flow_control/if_let.md
@@ -118,6 +118,6 @@ fn main() {
 
 [`enum`][enum], [`Option`][option], and the [RFC][if_let_rfc]
 
-[enum]: custom_types/enum.html
+[enum]: ../custom_types/enum.md
 [if_let_rfc]: https://github.com/rust-lang/rfcs/pull/160
-[option]: std/option.html
+[option]: ../std/option.md
diff --git a/src/flow_control/match/binding.md b/src/flow_control/match/binding.md
@@ -29,4 +29,4 @@ fn main() {
 ### See also:
 [functions]
 
-[functions]: fn.html
+[functions]: ../../fn.md
diff --git a/src/flow_control/match/destructuring.md b/src/flow_control/match/destructuring.md
@@ -8,7 +8,7 @@ A `match` block can destructure items in a variety of ways.
 * [Destructuring Tuples][tuple]
 
 
-[enum]: flow_control/match/destructuring/destructure_enum.html
-[refs]: flow_control/match/destructuring/destructure_pointers.html
-[struct]: flow_control/match/destructuring/destructure_structures.html
-[tuple]: flow_control/match/destructuring/destructure_tuple.html
+[enum]: destructuring/destructure_enum.md
+[refs]: destructuring/destructure_pointers.md
+[struct]: destructuring/destructure_structures.md
+[tuple]: destructuring/destructure_tuple.md
diff --git a/src/flow_control/match/destructuring/destructure_enum.md b/src/flow_control/match/destructuring/destructure_enum.md
@@ -49,6 +49,6 @@ fn main() {
 
 [`#[allow(...)]`][allow], [color models][color_models] and [`enum`][enum]
 
-[allow]: attribute/unused.html
+[allow]: ../../../attribute/unused.md
 [color_models]: https://en.wikipedia.org/wiki/Color_model
-[enum]: custom_types/enum.html
+[enum]: ../../../custom_types/enum.md
diff --git a/src/flow_control/match/destructuring/destructure_structures.md b/src/flow_control/match/destructuring/destructure_structures.md
@@ -29,4 +29,4 @@ fn main() {
 
 ### See also:
 
-[Structs](custom_types/structs.html), [The ref pattern](scope/borrow/ref.html)
+[Structs](../../../custom_types/structs.md), [The ref pattern](../../../scope/borrow/ref.md)
diff --git a/src/flow_control/match/destructuring/destructure_tuple.md b/src/flow_control/match/destructuring/destructure_tuple.md
@@ -21,4 +21,4 @@ fn main() {
 
 ### See also:
 
-[Tuples](primitives/tuples.html)
+[Tuples](../../../primitives/tuples.md)
diff --git a/src/flow_control/match/guard.md b/src/flow_control/match/guard.md
@@ -20,4 +20,4 @@ fn main() {
 
 ### See also:
 
-[Tuples](primitives/tuples.html)
+[Tuples](../../primitives/tuples.md)
diff --git a/src/flow_control/while_let.md b/src/flow_control/while_let.md
@@ -57,6 +57,6 @@ fn main() {
 
 [`enum`][enum], [`Option`][option], and the [RFC][while_let_rfc]
 
-[enum]: custom_types/enum.html
-[option]: std/option.html
+[enum]: ../custom_types/enum.md
+[option]: ../std/option.md
 [while_let_rfc]: https://github.com/rust-lang/rfcs/pull/214
diff --git a/src/fn/closures/anonymity.md b/src/fn/closures/anonymity.md
@@ -49,7 +49,7 @@ fn main() {
 [A thorough analysis][thorough_analysis], [`Fn`][fn], [`FnMut`][fn_mut],
 and [`FnOnce`][fn_once]
 
-[generics]: generics.html
+[generics]: ../../generics.md
 [fn]: https://doc.rust-lang.org/std/ops/trait.Fn.html
 [fn_mut]: https://doc.rust-lang.org/std/ops/trait.FnMut.html
 [fn_once]: https://doc.rust-lang.org/std/ops/trait.FnOnce.html

diff --git a/src/fn/closures/capture.md b/src/fn/closures/capture.md
@@ -97,5 +97,5 @@ fn main() {
 
 [`Box`][box] and [`std::mem::drop`][drop]
 
-[box]: std/box.html
+[box]: ../../std/box.md
 [drop]: https://doc.rust-lang.org/std/mem/fn.drop.html
diff --git a/src/fn/closures/output_parameters.md b/src/fn/closures/output_parameters.md
@@ -46,8 +46,8 @@ fn main() {
 
 [Boxing][box], [`Fn`][fn], [`FnMut`][fnmut], and [Generics][generics].
 
-[box]: std/box.html
+[box]: ../../std/box.md
 [fn]: https://doc.rust-lang.org/std/ops/trait.Fn.html
 [fnmut]: https://doc.rust-lang.org/std/ops/trait.FnMut.html
 [fnbox]: https://doc.rust-lang.org/std/boxed/trait.FnBox.html 
-[generics]: generics.html
+[generics]: ../../generics.md
diff --git a/src/generics.md b/src/generics.md
@@ -60,5 +60,5 @@ fn main() {
 
 [`struct`s][structs]
 
-[structs]: custom_types/structs.html
+[structs]: custom_types/structs.md
 [camelcase]: https://en.wikipedia.org/wiki/CamelCase
diff --git a/src/generics/assoc_items/the_problem.md b/src/generics/assoc_items/the_problem.md
@@ -63,5 +63,5 @@ fn main() {
 
 [`struct`s][structs], and [`trait`s][traits]
 
-[structs]: custom_types/structs.html
-[traits]: trait.html
+[structs]: ../../custom_types/structs.md
+[traits]: ../../trait.md
diff --git a/src/generics/bounds.md b/src/generics/bounds.md
@@ -74,8 +74,8 @@ some cases to be more expressive.
 
 [`std::fmt`][fmt], [`struct`s][structs], and [`trait`s][traits]
 
-[fmt]: hello/print.html
-[methods]: fn/methods.html
-[structs]: custom_types/structs.html
-[traits]: trait.html
-[where]: generics/where.html
+[fmt]: ../hello/print.md
+[methods]: ../fn/methods.md
+[structs]: ../custom_types/structs.md
+[traits]: ../trait.md
+[where]: ../generics/where.md
diff --git a/src/generics/bounds/testcase_empty.md b/src/generics/bounds/testcase_empty.md
@@ -40,4 +40,4 @@ fn main() {
 
 [eq]: https://doc.rust-lang.org/std/cmp/trait.Eq.html
 [ord]: https://doc.rust-lang.org/std/cmp/trait.Ord.html
-[traits]: trait.html
+[traits]: ../../trait.md
diff --git a/src/generics/gen_fn.md b/src/generics/gen_fn.md
@@ -55,5 +55,5 @@ fn main() {
 
 [functions][fn] and [`struct`s][structs]
 
-[fn]: fn.html
-[structs]: custom_types/structs.html
+[fn]: ../fn.md
+[structs]: ../custom_types/structs.md
diff --git a/src/generics/gen_trait.md b/src/generics/gen_trait.md
@@ -41,5 +41,5 @@ fn main() {
 [`Drop`][Drop], [`struct`][structs], and [`trait`][traits]
 
 [Drop]: https://doc.rust-lang.org/std/ops/trait.Drop.html
-[structs]: custom_types/structs.html
-[traits]: trait.html
+[structs]: ../custom_types/structs.md
+[traits]: ../trait.md
diff --git a/src/generics/impl.md b/src/generics/impl.md
@@ -46,7 +46,7 @@ fn main() {
 [functions returning references][fn], [`impl`][methods], and [`struct`][structs]
 
 
-[fn]: scope/lifetime/fn.html
-[methods]: fn/methods.html
+[fn]: ../scope/lifetime/fn.md
+[methods]: ../fn/methods.md
 [specialization_plans]: https://blog.rust-lang.org/2015/05/11/traits.html#the-future
-[structs]: custom_types/structs.html
+[structs]: ../custom_types/structs.md
diff --git a/src/generics/multi_bounds.md b/src/generics/multi_bounds.md
@@ -33,5 +33,5 @@ fn main() {
 
 [`std::fmt`][fmt] and [`trait`s][traits]
 
-[fmt]: hello/print.html
-[traits]: trait.html
+[fmt]: ../hello/print.md
+[traits]: ../trait.md
diff --git a/src/generics/new_types.md b/src/generics/new_types.md
@@ -54,5 +54,5 @@ fn main() {
 
 [`structs`][struct]
 
-[struct]: custom_types/structs.html
+[struct]: ../custom_types/structs.md
 
diff --git a/src/generics/phantom.md b/src/generics/phantom.md
@@ -57,7 +57,7 @@ fn main() {
 
 [Derive], [struct], and [TupleStructs]
 
-[Derive]: trait/derive.html
-[struct]: custom_types/structs.html
-[TupleStructs]: custom_types/structs.html
+[Derive]: ../trait/derive.md
+[struct]: ../custom_types/structs.md
+[TupleStructs]: ../custom_types/structs.md
 [std::marker::PhantomData]: https://doc.rust-lang.org/std/marker/struct.PhantomData.html
diff --git a/src/generics/phantom/testcase_units.md b/src/generics/phantom/testcase_units.md
@@ -77,12 +77,12 @@ fn main() {
 [Borrowing (`&`)], [Bounds (`X: Y`)], [enum], [impl & self],
 [Overloading], [ref], [Traits (`X for Y`)], and [TupleStructs].
 
-[Borrowing (`&`)]: scope/borrow.html
-[Bounds (`X: Y`)]: generics/bounds.html
-[enum]: custom_types/enum.html
-[impl & self]: fn/methods.html
-[Overloading]: trait/ops.html
-[ref]: scope/borrow/ref.html
-[Traits (`X for Y`)]: trait.html
-[TupleStructs]: custom_types/structs.html
+[Borrowing (`&`)]: ../../scope/borrow.md
+[Bounds (`X: Y`)]: ../../generics/bounds.md
+[enum]: ../../custom_types/enum.md
+[impl & self]: ../../fn/methods.md
+[Overloading]: ../../trait/ops.md
+[ref]: ../../scope/borrow/ref.md
+[Traits (`X for Y`)]: ../../trait.md
+[TupleStructs]: ../../custom_types/structs.md
 [std::marker::PhantomData]: https://doc.rust-lang.org/std/marker/struct.PhantomData.html
diff --git a/src/generics/where.md b/src/generics/where.md
@@ -50,6 +50,6 @@ fn main() {
 
 [RFC][where], [`struct`][struct], and [`trait`][trait]
 
-[struct]: custom_types/structs.html
-[trait]: trait.html
+[struct]: ../custom_types/structs.md
+[trait]: ../trait.md
 [where]: https://github.com/rust-lang/rfcs/blob/master/text/0135-where.md
diff --git a/src/hello.md b/src/hello.md
@@ -46,4 +46,4 @@ Hello World!
 I'm a Rustacean!
 ```
 
-[macros]: macros.html
+[macros]: macros.md
diff --git a/src/hello/comment.md b/src/hello/comment.md
@@ -48,4 +48,4 @@ fn main() {
 
 [Library documentation][docs]
 
-[docs]: meta/doc.html
+[docs]: ../meta/doc.md
diff --git a/src/hello/print.md b/src/hello/print.md
@@ -86,9 +86,9 @@ Implementing the `fmt::Display` trait automagically implements the
 and [`traits`][traits]
 
 [fmt]: https://doc.rust-lang.org/std/fmt/
-[macros]: macros.html
-[string]: std/str.html
-[structs]: custom_types/structs.html
-[traits]: trait.html
+[macros]: ../macros.md
+[string]: ../std/str.md
+[structs]: ../custom_types/structs.md
+[traits]: ../trait.md
 [`ToString`]: https://doc.rust-lang.org/std/string/trait.ToString.html
-[convert]: conversion/string.html
+[convert]: ../conversion/string.md
diff --git a/src/hello/print/print_debug.md b/src/hello/print/print_debug.md
@@ -78,7 +78,7 @@ One can manually implement `fmt::Display` to control the display.
 and [`struct`][structs]
 
 [attributes]: https://doc.rust-lang.org/reference/attributes.html
-[derive]: trait/derive.html
+[derive]: ../../trait/derive.md
 [fmt]: https://doc.rust-lang.org/std/fmt/
-[structs]: custom_types/structs.html
+[structs]: ../../custom_types/structs.md