Make some diagnostics not depend on the source of what they reference being available #105500

oli-obk · 2022-12-09T16:51:37Z

follow up to #104449

rustbot · 2022-12-09T16:51:47Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @estebank (or someone else) soon.

Please see the contribution instructions for more information.

src/test/ui/async-await/issues/issue-67893.stderr

compiler/rustc_privacy/src/lib.rs

src/test/ui/alloc-error/alloc-error-handler-bad-signature-2.stderr

src/test/ui/associated-types/trait-with-supertraits-needing-sized-self.stderr

src/test/ui/async-await/issues/issue-67893.stderr

estebank · 2022-12-09T17:07:57Z

I'm seeing a bunch of test output changes that do not seem related to your code changes. Could there be a missing commit?

oli-obk · 2022-12-09T17:09:34Z

I'm seeing a bunch of test output changes that do not seem related to your code changes. Could there be a missing commit?

I don't believe so

src/test/ui/async-await/pin-needed-to-poll.stderr

src/test/ui/binop/binop-consume-args.stderr

src/test/ui/binop/issue-28837.stderr

src/test/ui/borrowck/borrowck-move-out-of-overloaded-auto-deref.stderr

src/test/ui/builtin-superkinds/builtin-superkinds-in-metadata.stderr

src/test/ui/pattern/usefulness/doc-hidden-non-exhaustive.stderr

src/test/ui/pattern/usefulness/issue-3601.stderr

src/test/ui/privacy/associated-item-privacy-trait.stderr

estebank · 2022-12-09T21:26:23Z

compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs

+                let snippet = match source_map.span_to_snippet(interior_span) {
+                    // #70935: If snippet contains newlines, display "the value" instead
+                    // so that we do not emit complex diagnostics.
+                    Ok(snippet) if !snippet.contains('\n') => format!("`{}`", snippet),


Should we add a length check here too, just to make sure that the snippet is not for a long expr in one line?

maybe this entire diagnostic deserves a redesign to point at the span instead of getting the snippet in a message?

bors · 2022-12-11T12:39:07Z

☔ The latest upstream changes (presumably #105554) made this pull request unmergeable. Please resolve the merge conflicts.

estebank · 2022-12-12T17:54:58Z

src/test/ui/closures/issue-90871.stderr

@@ -3,11 +3,9 @@ error[E0412]: cannot find type `n` in this scope
   |
 LL |     type_ascribe!(2, n([u8; || 1]))
   |                      ^ help: a trait with a similar name exists: `Fn`
+  --> $SRC_DIR/core/src/ops/function.rs:LL:COL


This is outstanding: it should be ::: or

note: similarly named --> $SRC_DIR/...

estebank · 2022-12-12T17:56:50Z

@bors r+

bors · 2022-12-12T17:56:52Z

📌 Commit e9dae2129800ad96b1b0ead3a0f485dbd412c06c has been approved by estebank

It is now in the queue for this repository.

bors · 2022-12-13T04:25:08Z

☔ The latest upstream changes (presumably #105644) made this pull request unmergeable. Please resolve the merge conflicts.

… being available

… of relying on the span making it obvious

…lable

…nostics

oli-obk · 2022-12-13T10:35:05Z

@bors r=estebank

bors · 2022-12-13T10:35:07Z

📌 Commit 82ce70a has been approved by estebank

It is now in the queue for this repository.

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#105147 (Allow unsafe through inline const) - rust-lang#105438 (Move some codegen-y methods from `rustc_hir_analysis::collect` -> `rustc_codegen_ssa`) - rust-lang#105464 (Support #[track_caller] on async closures) - rust-lang#105476 (Change pattern borrowing suggestions to be verbose and remove invalid suggestion) - rust-lang#105500 (Make some diagnostics not depend on the source of what they reference being available) - rust-lang#105628 (Small doc fixes) - rust-lang#105659 (Don't require owned data in `MaybeStorageLive`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

rustbot assigned estebank Dec 9, 2022

rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Dec 9, 2022

oli-obk commented Dec 9, 2022

View reviewed changes

src/test/ui/async-await/issues/issue-67893.stderr Outdated Show resolved Hide resolved