about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSteve Klabnik <steve@steveklabnik.com>2017-12-15 09:26:56 -0500
committerGitHub <noreply@github.com>2017-12-15 09:26:56 -0500
commitba67acc0e743e45fe6e42387d2e6c5d97667bd48 (patch)
treeac5bbe8100f208174b1b1a9aa2ca1cd8f2d5818d
parentb4f323254a2cf227852eec1b40db0b152fc6042c (diff)
parentd755be69e8617544d1e382d690b97917bdede419 (diff)
Rollup merge of #46601 - matthewjasper:method-link-change, r=steveklabnik
Use a better link for method resolution in Deref docs

rust-lang-nursery/reference#149 breaks these links, so make them point to somewhere which won't break and provides a more deatailed description of method resolution.

cc @Havvy
r? @steveklabnik
-rw-r--r--src/libcore/ops/deref.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libcore/ops/deref.rs b/src/libcore/ops/deref.rs
index 80c48c7b28e..4ce0740130b 100644
--- a/src/libcore/ops/deref.rs
+++ b/src/libcore/ops/deref.rs
@@ -35,13 +35,13 @@
 ///
 /// For more details, visit [the chapter in *The Rust Programming Language*]
 /// [book] as well as the reference sections on [the dereference operator]
-/// [ref-deref-op], [the `Deref` trait][ref-deref-trait], and [type coercions].
+/// [ref-deref-op], [method resolution] and [type coercions].
 ///
 /// [book]: ../../book/second-edition/ch15-02-deref.html
 /// [`DerefMut`]: trait.DerefMut.html
 /// [more]: #more-on-deref-coercion
 /// [ref-deref-op]: ../../reference/expressions/operator-expr.html#the-dereference-operator
-/// [ref-deref-trait]: ../../reference/the-deref-trait.html
+/// [method resolution]: ../../reference/expressions/method-call-expr.html
 /// [type coercions]: ../../reference/type-coercions.html
 ///
 /// # Examples
@@ -122,13 +122,13 @@ impl<'a, T: ?Sized> Deref for &'a mut T {
 ///
 /// For more details, visit [the chapter in *The Rust Programming Language*]
 /// [book] as well as the reference sections on [the dereference operator]
-/// [ref-deref-op], [the `Deref` trait][ref-deref-trait], and [type coercions].
+/// [ref-deref-op], [method resolution] and [type coercions].
 ///
 /// [book]: ../../book/second-edition/ch15-02-deref.html
 /// [`Deref`]: trait.Deref.html
 /// [more]: #more-on-deref-coercion
 /// [ref-deref-op]: ../../reference/expressions/operator-expr.html#the-dereference-operator
-/// [ref-deref-trait]: ../../reference/the-deref-trait.html
+/// [method resolution]: ../../reference/expressions/method-call-expr.html
 /// [type coercions]: ../../reference/type-coercions.html
 ///
 /// # Examples