about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorSteve Klabnik <steve@steveklabnik.com>2015-08-05 15:09:49 -0400
committerSteve Klabnik <steve@steveklabnik.com>2015-08-05 15:09:49 -0400
commit50dd4977fda23d857d27ebae432c7a22f60d7489 (patch)
treeda02097afc96378d068da002a6c65ffdc99f17af /src
parent1fb78b19ce0f75c6e6297b26b20d92f31c27e703 (diff)
parent340c25aebfee25534b8b95fa7ed7afd35e0b2e4b (diff)
downloadrust-50dd4977fda23d857d27ebae432c7a22f60d7489.tar.gz
rust-50dd4977fda23d857d27ebae432c7a22f60d7489.zip
Rollup merge of #27524 - steveklabnik:gh27523, r=gankro
This wording was too strong.

Fixes #27523
Diffstat (limited to 'src')
-rw-r--r--src/libcore/marker.rs6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/libcore/marker.rs b/src/libcore/marker.rs
index ebd6ba544e4..c0956753c98 100644
--- a/src/libcore/marker.rs
+++ b/src/libcore/marker.rs
@@ -273,7 +273,11 @@ macro_rules! impls{
 /// even though it does not. This allows you to inform the compiler about certain safety properties
 /// of your code.
 ///
-/// Though they both have scary names, `PhantomData<T>` and "phantom types" are unrelated. 👻👻👻
+/// # A ghastly note 👻👻👻
+///
+/// Though they both have scary names, `PhantomData<T>` and 'phantom types' are related, but not
+/// identical. Phantom types are a more general concept that don't require `PhantomData<T>` to
+/// implement, but `PhantomData<T>` is the most common way to implement them in a correct manner.
 ///
 /// # Examples
 ///