about summary refs log tree commit diff
path: root/src/libcore
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-05-12 19:11:44 +0000
committerbors <bors@rust-lang.org>2015-05-12 19:11:44 +0000
commitc2b30b86df6b34ba19e87e63402e43d9e81a64fb (patch)
tree72ea5b1f96b971b89f30dc992dc77e66b0502951 /src/libcore
parent3ca008dcf12283247122f25928630f2a484ff768 (diff)
parent25815655c01e0ec9624c0fae39f6691c3a90a776 (diff)
downloadrust-c2b30b86df6b34ba19e87e63402e43d9e81a64fb.tar.gz
rust-c2b30b86df6b34ba19e87e63402e43d9e81a64fb.zip
Auto merge of #25340 - Manishearth:rollup, r=Manishearth
- Successful merges: #24996, #25220, #25221, #25267, #25322, #25327, #25329, #25330, #25331, #25335
- Failed merges: #25334
Diffstat (limited to 'src/libcore')
-rw-r--r--src/libcore/convert.rs5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/libcore/convert.rs b/src/libcore/convert.rs
index da6ac6bd752..f6987c19664 100644
--- a/src/libcore/convert.rs
+++ b/src/libcore/convert.rs
@@ -24,6 +24,11 @@ use marker::Sized;
 
 /// A cheap, reference-to-reference conversion.
 ///
+/// `AsRef` is very similar to, but different than, `Borrow`. See
+/// [the book][book] for more.
+///
+/// [book]: ../../book/borrow-and-asref.html
+///
 /// # Examples
 ///
 /// Both `String` and `&str` implement `AsRef<str>`: