diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-02-14 02:41:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-14 02:41:16 +0100 |
| commit | aa896f30bb7f848b8becf54b614b8eadcef22a26 (patch) | |
| tree | 77ca0b4d9c39d45e646d9264adda036cfeb8fb1e /src/libcore | |
| parent | 93ecae63d89f66af6029a002b2269e6fb3687dd4 (diff) | |
| parent | e7f8e63ed425cef77a9ad43e463b39009c1a495a (diff) | |
| download | rust-aa896f30bb7f848b8becf54b614b8eadcef22a26.tar.gz rust-aa896f30bb7f848b8becf54b614b8eadcef22a26.zip | |
Rollup merge of #57856 - lzutao:fix-old-first-edition, r=steveklabnik
Convert old first edition links to current edition one r? @steveklabnik
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/convert.rs | 5 | ||||
| -rw-r--r-- | src/libcore/marker.rs | 4 | ||||
| -rw-r--r-- | src/libcore/mem.rs | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/src/libcore/convert.rs b/src/libcore/convert.rs index 4a7c6e15a4d..b8d751cfbb6 100644 --- a/src/libcore/convert.rs +++ b/src/libcore/convert.rs @@ -116,9 +116,6 @@ pub const fn identity<T>(x: T) -> T { x } /// - Use `Borrow` when the goal is related to writing code that is agnostic to /// the type of borrow and whether it is a reference or value /// -/// See [the book][book] for a more detailed comparison. -/// -/// [book]: ../../book/first-edition/borrow-and-asref.html /// [`Borrow`]: ../../std/borrow/trait.Borrow.html /// /// **Note: this trait must not fail**. If the conversion can fail, use a @@ -351,7 +348,7 @@ pub trait Into<T>: Sized { /// [`String`]: ../../std/string/struct.String.html /// [`Into<U>`]: trait.Into.html /// [`from`]: trait.From.html#tymethod.from -/// [book]: ../../book/first-edition/error-handling.html +/// [book]: ../../book/ch09-00-error-handling.html #[stable(feature = "rust1", since = "1.0.0")] pub trait From<T>: Sized { /// Performs the conversion. diff --git a/src/libcore/marker.rs b/src/libcore/marker.rs index 457d556e4fa..c4b41f1a309 100644 --- a/src/libcore/marker.rs +++ b/src/libcore/marker.rs @@ -78,7 +78,7 @@ impl<T: ?Sized> !Send for *mut T { } /// // be made into an object /// ``` /// -/// [trait object]: ../../book/first-edition/trait-objects.html +/// [trait object]: ../../book/ch17-02-trait-objects.html #[stable(feature = "rust1", since = "1.0.0")] #[lang = "sized"] #[rustc_on_unimplemented( @@ -518,7 +518,7 @@ macro_rules! impls{ /// types. We track the Rust type using a phantom type parameter on /// the struct `ExternalResource` which wraps a handle. /// -/// [FFI]: ../../book/first-edition/ffi.html +/// [FFI]: ../../book/ch19-01-unsafe-rust.html#using-extern-functions-to-call-external-code /// /// ``` /// # #![allow(dead_code)] diff --git a/src/libcore/mem.rs b/src/libcore/mem.rs index 2a493e88fe8..3f7455aeb59 100644 --- a/src/libcore/mem.rs +++ b/src/libcore/mem.rs @@ -299,7 +299,7 @@ pub const fn size_of<T>() -> usize { /// then `size_of_val` can be used to get the dynamically-known size. /// /// [slice]: ../../std/primitive.slice.html -/// [trait object]: ../../book/first-edition/trait-objects.html +/// [trait object]: ../../book/ch17-02-trait-objects.html /// /// # Examples /// |