diff options
| author | bors <bors@rust-lang.org> | 2023-03-12 09:44:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-03-12 09:44:17 +0000 |
| commit | 24c0b81c1fd5de8e00276524896d3352ed91a8cb (patch) | |
| tree | 884da1d0a42415c5c2aac83cac2d7f7f2b8d8df9 /compiler/rustc_error_codes | |
| parent | 150cb381471533050751111e5faf1d9f05c02f77 (diff) | |
| parent | 3166b4a24599aa4237fae54ac7d8054fb7048b75 (diff) | |
| download | rust-24c0b81c1fd5de8e00276524896d3352ed91a8cb.tar.gz rust-24c0b81c1fd5de8e00276524896d3352ed91a8cb.zip | |
Auto merge of #109043 - matthiaskrgr:rollup-genkz0e, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #108726 (tidy: enforce comment blocks to have an even number of backticks) - #108797 (Allow binary files to go through the `FileLoader`) - #108841 (Add suggestion to diagnostic when user has array but trait wants slice. (rebased)) - #108984 (bootstrap: document tidy) - #109013 (Give proper error message when tcx wasn't passed to decoder) - #109017 (remove duplicated calls to sort_string) - #109018 (Expand on the allocator comment in `rustc-main`) - #109028 (Add eslint checks for rustdoc-js tester) - #109034 (Commit some tests for the new solver + lazy norm) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_error_codes')
| -rw-r--r-- | compiler/rustc_error_codes/src/error_codes/E0368.md | 2 | ||||
| -rw-r--r-- | compiler/rustc_error_codes/src/error_codes/E0710.md | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/compiler/rustc_error_codes/src/error_codes/E0368.md b/compiler/rustc_error_codes/src/error_codes/E0368.md index 7b9d9334821..b18e8758d71 100644 --- a/compiler/rustc_error_codes/src/error_codes/E0368.md +++ b/compiler/rustc_error_codes/src/error_codes/E0368.md @@ -41,7 +41,7 @@ impl Add for Foo { fn main() { let mut x: Foo = Foo(5); - x += Foo(7); // error, `+= cannot be applied to the type `Foo` + x += Foo(7); // error, `+=` cannot be applied to the type `Foo` } ``` diff --git a/compiler/rustc_error_codes/src/error_codes/E0710.md b/compiler/rustc_error_codes/src/error_codes/E0710.md index b7037ea611b..84d55d52426 100644 --- a/compiler/rustc_error_codes/src/error_codes/E0710.md +++ b/compiler/rustc_error_codes/src/error_codes/E0710.md @@ -3,14 +3,14 @@ An unknown tool name was found in a scoped lint. Erroneous code examples: ```compile_fail,E0710 -#[allow(clipp::filter_map)] // error!` +#[allow(clipp::filter_map)] // error! fn main() { // business logic } ``` ```compile_fail,E0710 -#[warn(clipp::filter_map)] // error!` +#[warn(clipp::filter_map)] // error! fn main() { // business logic } |
