about summary refs log tree commit diff
path: root/src/libcore
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-06-10 07:43:52 -0700
committerGitHub <noreply@github.com>2016-06-10 07:43:52 -0700
commita267d6cee40c2f2fa3db999afbb2bd1384f7840a (patch)
tree7f019ee7195a933addb73b8f0dee845c1349bd08 /src/libcore
parent68241f00ad8fb90474748b37ebd68b6bd46c796b (diff)
parent107d423f1ab9a110fdf2253e7d0074f0ab5bf868 (diff)
downloadrust-a267d6cee40c2f2fa3db999afbb2bd1384f7840a.tar.gz
rust-a267d6cee40c2f2fa3db999afbb2bd1384f7840a.zip
Auto merge of #34200 - sanxiyn:rollup, r=sanxiyn
Rollup of 12 pull requests

- Successful merges: #34088, #34129, #34136, #34145, #34146, #34148, #34159, #34160, #34165, #34175, #34184, #34185
- Failed merges:
Diffstat (limited to 'src/libcore')
-rw-r--r--src/libcore/any.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libcore/any.rs b/src/libcore/any.rs
index dfd2ba9154d..49304b1f3bf 100644
--- a/src/libcore/any.rs
+++ b/src/libcore/any.rs
@@ -85,7 +85,7 @@ use marker::{Reflect, Sized};
 
 /// A type to emulate dynamic typing.
 ///
-/// Every type with no non-`'static` references implements `Any`.
+/// Most types implement `Any`. However, any type which contains a non-`'static` reference does not.
 /// See the [module-level documentation][mod] for more details.
 ///
 /// [mod]: index.html