about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2019-07-30 05:37:43 +0200
committerGitHub <noreply@github.com>2019-07-30 05:37:43 +0200
commita03caecc53c9a668a6cecbc0dd2c6b0c316dd775 (patch)
tree7af01fb16c375d2f0e144a1cc3d941694de44825
parent3ef6f6d10ddec3da4daa9a769ebd533b98762d07 (diff)
parentc56d8a81e2eec2230b0d3fe6a26ca90c5462029a (diff)
downloadrust-a03caecc53c9a668a6cecbc0dd2c6b0c316dd775.tar.gz
rust-a03caecc53c9a668a6cecbc0dd2c6b0c316dd775.zip
Rollup merge of #63108 - lzutao:option-xor-typo, r=jonas-schievink
Add links to None in Option doc

r? @jonas-schievink
-rw-r--r--src/libcore/option.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libcore/option.rs b/src/libcore/option.rs
index 70a87cfe5a7..7713e5761d4 100644
--- a/src/libcore/option.rs
+++ b/src/libcore/option.rs
@@ -8,7 +8,7 @@
 //! * Initial values
 //! * Return values for functions that are not defined
 //!   over their entire input range (partial functions)
-//! * Return value for otherwise reporting simple errors, where `None` is
+//! * Return value for otherwise reporting simple errors, where [`None`] is
 //!   returned on error
 //! * Optional struct fields
 //! * Struct fields that can be loaned or "taken"
@@ -752,7 +752,7 @@ impl<T> Option<T> {
         }
     }
 
-    /// Returns [`Some`] if exactly one of `self`, `optb` is [`Some`], otherwise returns `None`.
+    /// Returns [`Some`] if exactly one of `self`, `optb` is [`Some`], otherwise returns [`None`].
     ///
     /// [`Some`]: #variant.Some
     /// [`None`]: #variant.None