diff options
| author | Jonas Schievink <jonasschievink@gmail.com> | 2020-10-29 17:05:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-29 17:05:31 +0100 |
| commit | e656e609ba8794997d466f764d83374de61b8eea (patch) | |
| tree | 67e1d168c275f6069afedcefc41304dce80cc46b /compiler/rustc_errors/src | |
| parent | 1d6e20e706ba1e90f52e0e6029f06b81d705aed4 (diff) | |
| parent | 3fba94851064dd7d9076480080e9387b81d68359 (diff) | |
| download | rust-e656e609ba8794997d466f764d83374de61b8eea.tar.gz rust-e656e609ba8794997d466f764d83374de61b8eea.zip | |
Rollup merge of #78527 - bugadani:typo3, r=jonas-schievink
Fix some more typos
Diffstat (limited to 'compiler/rustc_errors/src')
| -rw-r--r-- | compiler/rustc_errors/src/emitter.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_errors/src/emitter.rs b/compiler/rustc_errors/src/emitter.rs index b5155f8e910..08e9bdf3087 100644 --- a/compiler/rustc_errors/src/emitter.rs +++ b/compiler/rustc_errors/src/emitter.rs @@ -513,7 +513,7 @@ impl Emitter for SilentEmitter { /// Maximum number of lines we will print for a multiline suggestion; arbitrary. /// /// This should be replaced with a more involved mechanism to output multiline suggestions that -/// more closely mimmics the regular diagnostic output, where irrelevant code lines are elided. +/// more closely mimics the regular diagnostic output, where irrelevant code lines are elided. pub const MAX_SUGGESTION_HIGHLIGHT_LINES: usize = 6; /// Maximum number of suggestions to be shown /// @@ -887,7 +887,7 @@ impl EmitterWriter { // or the next are vertical line placeholders. || (annotation.takes_space() // If either this or the next annotation is && next.has_label()) // multiline start/end, move it to a new line - || (annotation.has_label() // so as not to overlap the orizontal lines. + || (annotation.has_label() // so as not to overlap the horizontal lines. && next.takes_space()) || (annotation.takes_space() && next.takes_space()) || (overlaps(next, annotation, l) |