about summary refs log tree commit diff
path: root/src/libcore
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-05-10 20:44:45 +0000
committerbors <bors@rust-lang.org>2015-05-10 20:44:45 +0000
commit9ecc9896dedb426e3f4eb3d23dfc60192fe5275f (patch)
treefd8c0fefebe5f85a5d400487383c4c9567353268 /src/libcore
parent750f2c63f2737305d33288303cdecb7a470a7922 (diff)
parentc70458ba5dc19dde84d5cf54265e5d100abf5784 (diff)
downloadrust-9ecc9896dedb426e3f4eb3d23dfc60192fe5275f.tar.gz
rust-9ecc9896dedb426e3f4eb3d23dfc60192fe5275f.zip
Auto merge of #25281 - steveklabnik:rollup, r=steveklabnik
- Successful merges: #24948, #25158, #25188, #25222, #25239, #25240, #25241, #25255, #25257, #25263
- Failed merges: 
Diffstat (limited to 'src/libcore')
-rw-r--r--src/libcore/convert.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libcore/convert.rs b/src/libcore/convert.rs
index d3de77a9241..da6ac6bd752 100644
--- a/src/libcore/convert.rs
+++ b/src/libcore/convert.rs
@@ -173,6 +173,7 @@ impl<T> AsMut<[T]> for [T] {
 
 #[stable(feature = "rust1", since = "1.0.0")]
 impl AsRef<str> for str {
+    #[inline]
     fn as_ref(&self) -> &str {
         self
     }