diff options
| author | bors <bors@rust-lang.org> | 2023-06-23 11:41:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-06-23 11:41:43 +0000 |
| commit | 54d6738a8df74382c439e1dfb9ce4e2382d7742e (patch) | |
| tree | 583ef1002164999982cf99c256bace32b8722e41 /tests/ui/error-codes | |
| parent | fe37f37e4b764bb82fc0eb8c727842746de7c93f (diff) | |
| parent | c5fd53774fde96b74b31c280972142c04e3a3445 (diff) | |
| download | rust-54d6738a8df74382c439e1dfb9ce4e2382d7742e.tar.gz rust-54d6738a8df74382c439e1dfb9ce4e2382d7742e.zip | |
Auto merge of #112957 - matthiaskrgr:rollup-7ly0nv7, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #111747 (Don't structurally resolve during method ambiguity in probe) - #112704 (slice::from_raw_parts: mention no-wrap-around condition) - #112927 (Fix indentation for where clause in rustdoc pages) - #112933 (Avoid `&format` in error message code) - #112935 (style-guide: Fix typo) - #112941 (typo) - #112942 (style-guide: Organizational and editing tweaks (no semantic changes)) - #112944 (style-guide: Add language disclaiming any effects on non-default Rust styles) - #112948 (Avoid guessing unknown trait implementation in suggestions) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'tests/ui/error-codes')
| -rw-r--r-- | tests/ui/error-codes/E0283.stderr | 4 | ||||
| -rw-r--r-- | tests/ui/error-codes/E0790.stderr | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/ui/error-codes/E0283.stderr b/tests/ui/error-codes/E0283.stderr index 90316c6e981..89e634a7064 100644 --- a/tests/ui/error-codes/E0283.stderr +++ b/tests/ui/error-codes/E0283.stderr @@ -9,8 +9,8 @@ LL | let cont: u32 = Generator::create(); | help: use a fully-qualified path to a specific available implementation (2 found) | -LL | let cont: u32 = <Impl as Generator>::create(); - | ++++++++ + +LL | let cont: u32 = </* self type */ as Generator>::create(); + | +++++++++++++++++++ + error[E0283]: type annotations needed --> $DIR/E0283.rs:35:24 diff --git a/tests/ui/error-codes/E0790.stderr b/tests/ui/error-codes/E0790.stderr index fc025a3fca2..7248766285d 100644 --- a/tests/ui/error-codes/E0790.stderr +++ b/tests/ui/error-codes/E0790.stderr @@ -65,8 +65,8 @@ LL | MyTrait2::my_fn(); | help: use a fully-qualified path to a specific available implementation (2 found) | -LL | <Impl1 as MyTrait2>::my_fn(); - | +++++++++ + +LL | </* self type */ as MyTrait2>::my_fn(); + | +++++++++++++++++++ + error: aborting due to 5 previous errors |