diff options
| author | bors <bors@rust-lang.org> | 2019-05-05 21:11:47 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-05-05 21:11:47 +0000 |
| commit | 40bd145cbef28d279aacc903907c3945f83a6296 (patch) | |
| tree | 482b6a07004b00963ca608ac27e1e6d4ed1bfde0 /src/libstd | |
| parent | d628c2e642c6f8f85f24dd5d7f49de89b95bf682 (diff) | |
| parent | ff7ef116fbe4698f9df0370021d398dc345b832b (diff) | |
| download | rust-40bd145cbef28d279aacc903907c3945f83a6296.tar.gz rust-40bd145cbef28d279aacc903907c3945f83a6296.zip | |
Auto merge of #60567 - Manishearth:rollup-rjagqnw, r=Manishearth
Rollup of 5 pull requests Successful merges: - #60131 (Fix broken link in rustc_plugin doc) - #60426 (Stop `-O`/`-C opt-level` and `-g`/`-C debuginfo` conflicting) - #60515 (use span instead of div for since version) - #60530 (rustc: rename all occurences of "freevar" to "upvar".) - #60536 (Correct code points to match their textual description) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/primitive_docs.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/primitive_docs.rs b/src/libstd/primitive_docs.rs index 94fece10e0f..24f728158c4 100644 --- a/src/libstd/primitive_docs.rs +++ b/src/libstd/primitive_docs.rs @@ -279,7 +279,7 @@ mod prim_never { } /// /// As always, remember that a human intuition for 'character' may not map to /// Unicode's definitions. For example, despite looking similar, the 'é' -/// character is one Unicode code point while 'é' is two Unicode code points: +/// character is one Unicode code point while 'é' is two Unicode code points: /// /// ``` /// let mut chars = "é".chars(); |