diff options
| author | bors <bors@rust-lang.org> | 2024-12-19 05:43:07 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-12-19 05:43:07 +0000 |
| commit | bab18a542d95b5c76620d0a0d383d7ab683cc1b7 (patch) | |
| tree | ee2782411ba12cd3e957042a5a0483c2782d79cd /compiler/rustc_errors/src | |
| parent | 023521e6825edfa6df01e392520d7cb120eab158 (diff) | |
| parent | 80cf85d5846d13fd8594caa2e476501bf78af8cd (diff) | |
| download | rust-bab18a542d95b5c76620d0a0d383d7ab683cc1b7.tar.gz rust-bab18a542d95b5c76620d0a0d383d7ab683cc1b7.zip | |
Auto merge of #134492 - jhpratt:rollup-elpdwd9, r=jhpratt
Rollup of 8 pull requests Successful merges: - #132056 (Stabilize `#[diagnostic::do_not_recommend]`) - #133643 (-Znext-solver: modify candidate preference rules) - #134388 (Update books) - #134418 (Advent of `tests/ui` (misc cleanups and improvements) [3/N]) - #134473 (chore: fix some typos) - #134481 (Point at lint name instead of whole attr for gated lints) - #134484 (Add nnethercote to the `triagebot.toml` vacation list.) - #134490 (Fix typo in ptr/mod.rs) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_errors/src')
| -rw-r--r-- | compiler/rustc_errors/src/emitter.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_errors/src/markdown/parse.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_errors/src/emitter.rs b/compiler/rustc_errors/src/emitter.rs index ac2f91cdeb3..f63188402fe 100644 --- a/compiler/rustc_errors/src/emitter.rs +++ b/compiler/rustc_errors/src/emitter.rs @@ -2523,7 +2523,7 @@ impl HumanEmitter { buffer.puts(*row_num, max_line_num_len + 1, "+ ", Style::Addition); } [] => { - // FIXME: needed? Doesn't get excercised in any test. + // FIXME: needed? Doesn't get exercised in any test. self.draw_col_separator_no_space(buffer, *row_num, max_line_num_len + 1); } _ => { diff --git a/compiler/rustc_errors/src/markdown/parse.rs b/compiler/rustc_errors/src/markdown/parse.rs index 8dd146c1c33..7a991a2ace7 100644 --- a/compiler/rustc_errors/src/markdown/parse.rs +++ b/compiler/rustc_errors/src/markdown/parse.rs @@ -346,7 +346,7 @@ fn parse_with_end_pat<'a>( None } -/// Resturn `(match, residual)` to end of line. The EOL is returned with the +/// Return `(match, residual)` to end of line. The EOL is returned with the /// residual. fn parse_to_newline(buf: &[u8]) -> (&[u8], &[u8]) { buf.iter().position(|ch| *ch == b'\n').map_or((buf, &[]), |pos| buf.split_at(pos)) |