about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-08-16 06:53:43 +0000
committerbors <bors@rust-lang.org>2015-08-16 06:53:43 +0000
commitbef7d90a3b96a6379c70ee28d48664ecb881bcdc (patch)
tree82f007628a1818b6b2bd833ec4b83e46ce274665
parent9165a4e2dcaaa878a33379c6ff097c68f0ca0485 (diff)
parentab45e51afa6cfc437841434d1b40790511a75afb (diff)
downloadrust-bef7d90a3b96a6379c70ee28d48664ecb881bcdc.tar.gz
rust-bef7d90a3b96a6379c70ee28d48664ecb881bcdc.zip
Auto merge of #27853 - seckar:master, r=steveklabnik
-rw-r--r--src/librustc_unicode/char.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_unicode/char.rs b/src/librustc_unicode/char.rs
index 03df6921a4f..780f8aa5be9 100644
--- a/src/librustc_unicode/char.rs
+++ b/src/librustc_unicode/char.rs
@@ -476,7 +476,7 @@ impl char {
     /// it maps one Unicode character to its uppercase equivalent
     /// according to the Unicode database [1]
     /// and the additional complex mappings [`SpecialCasing.txt`].
-    /// Conditional mappings (based on context or language) are not considerd here.
+    /// Conditional mappings (based on context or language) are not considered here.
     ///
     /// A full reference can be found here [2].
     ///