Rollup of 6 pull requests #110148

Dylan-DPC · 2023-04-10T16:38:28Z

Successful merges:

Migrating rustc_infer to session diagnostics (part 5) #108698 (Migrating rustc_infer to session diagnostics (part 5))
Add suggestion to remove derive() if invoked macro is non-derive #109638 (Add suggestion to remove derive() if invoked macro is non-derive)
rustc_middle: Document which exactly DefIds don't have DefKinds #109778 (rustc_middle: Document which exactly DefIds don't have DefKinds)
Add support for RISC-V relax target feature #109860 (Add support for RISC-V relax target feature)
Revert "Don't recover lifetimes/labels containing emojis as character literals" #110135 (Revert "Don't recover lifetimes/labels containing emojis as character literals")
Add regression test for #104916 #110147 (Add regression test for ICE "Not enough bound vars" #104916)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

It's now split between two errors, one to remove the invalid derive macro and one suggesting adding a new non-derive macro

…r_casting

Co-authored-by: David Wood <[email protected]>

…onCauseFailureCode (was FailureCodeDiagnostics)

…so removes `DiagArg`, as it's no longer necessary)

…g it more consistent with similar functions

Start messages with lowercase

… literals" Reverts PR rust-lang#108031 Fixes (doesnt close until beta backported) rust-lang#109746 This reverts commit e3f9db5. This reverts commit 98b82ae. This reverts commit 380fa26.

Signed-off-by: Yuki Okushi <[email protected]>

…avidtwco Migrating rustc_infer to session diagnostics (part 5) `@rustbot` label +A-translation cc rust-lang#100717

…avidtwco Add suggestion to remove `derive()` if invoked macro is non-derive Adds to the existing `expected derive macro, found {}` error message: ``` help: remove the surrounding "derive()": --> $DIR/macro-path-prelude-fail-4.rs:1:3 | LL | #[derive(inline)] | ^^^^^^^ ^ ``` This suggestion will either fix the issue, in the case that the macro was valid, or provide a better error message if not Not ready for merge yet, as the highlighted span is only valid for trivial formatting. Is there a nice way to get the parent span of the macro path within `smart_resolve_macro_path`? Closes rust-lang#109589

rustc_middle: Document which exactly `DefId`s don't have `DefKind`s I don't currently have time to investigate when and how to create these missing HIR nodes, but if someone else could do that it would be great.

Add support for RISC-V relax target feature This adds `relax` as an allowed RISC-V target feature. The relax feature in LLVM enables [linker relaxation](https://www.sifive.com/blog/all-aboard-part-3-linker-relaxation-in-riscv-toolchain), an optimization specific to RISC-V that allows global variable accesses to be resolved by the linker by using the global pointer (`gp`) register (rather than constructing the addresses from scratch for each access). Enabling `relax` will cause LLVM to emit relocations in the object file that support this. The feature can be enabled in rustc with `-C target-feature=+relax`. Currently this feature is disabled by default, but maybe it should be enabled by default since it is an easy performance improvement (but requires the `gp` register to be set up properly). GCC/Clang enable this feature by default (for both hosted/bare-metal targets), and include the `-mno-relax` flag to disable it (see [here](https://github.com/llvm/llvm-project/blob/466d554dcab39c3d42fe0c5b588b795e0e4b9d0d/clang/lib/Driver/ToolChains/Arch/RISCV.cpp#L145) for the code that enables it in Clang). I think it would make sense to enable by default, at least for all hosted targets since the `gp` register should be automatically set up by the runtime. For bare-metal targets, `gp` must be set up manually, so it is probably best to leave off by default to avoid breaking existing applications that do not set up `gp`. Leaving it disabled by default for all targets is also reasonable though. Let me know your thoughts. Thanks! Fixes rust-lang#109426.

…avidtwco Revert "Don't recover lifetimes/labels containing emojis as character literals" Reverts PR rust-lang#108031 per rust-lang#109754 (comment) Fixes (doesnt close until beta backported) rust-lang#109746 This reverts commit e3f9db5. This reverts commit 98b82ae. This reverts commit 380fa26.

…-errors Add regression test for rust-lang#104916 Closes rust-lang#104916 I haven't tested if it still passes with debug assertions enabled so it'd be better to wait for CI to be green. r? compiler-errors

Dylan-DPC · 2023-04-10T16:39:09Z

@bors r+ rollup=never p=5

bors · 2023-04-10T16:39:11Z

📌 Commit ab8b0ad has been approved by Dylan-DPC

It is now in the queue for this repository.

bors · 2023-04-10T16:41:26Z

⌛ Testing commit ab8b0ad with merge a12d8d5d93be331e66c3c976486d1fdaab1e4c74...

bors · 2023-04-10T19:11:28Z

☀️ Test successful - checks-actions
Approved by: Dylan-DPC
Pushing a12d8d5d93be331e66c3c976486d1fdaab1e4c74 to master...

bors · 2023-04-10T19:11:33Z

👀 Test was successful, but fast-forwarding failed: 422 Update is not a fast forward

rust-timer · 2023-04-10T20:32:41Z

Finished benchmarking commit (a12d8d5d93be331e66c3c976486d1fdaab1e4c74): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	0.3%	[0.3%, 0.3%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.3%	[0.3%, 0.3%]	1

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	0.9%	[0.9%, 0.9%]	1
Regressions ❌ (secondary)	2.5%	[2.5%, 2.5%]	1
Improvements ✅ (primary)	-0.9%	[-1.7%, -0.4%]	3
Improvements ✅ (secondary)	-4.1%	[-6.9%, -1.2%]	2
All ❌✅ (primary)	-0.4%	[-1.7%, 0.9%]	4

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.5%	[-0.5%, -0.5%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.5%	[-0.5%, -0.5%]	1

bors · 2023-04-13T12:52:53Z

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

NotStirred and others added 30 commits March 26, 2023 16:01

Add suggestion to remove derive() if invoked macro is non-derive

42f2be8

rustc_middle: Document which exactly DefIds don't have DefKinds

2e21b54

Update non-derive macro error message to match suggestion

10c3644

It's now split between two errors, one to remove the invalid derive macro and one suggesting adding a new non-derive macro

Fix typo

ed84d1d

Bless

86230dc

Add riscv relax target feature

48be303

Skip help messages if macro span is from macro

56207b8

Ported FunctionPointerSuggestion

37f5569

Migrate SuggestAsRefWhereAppropriate

b36abea

Migrate SuggestAccessingField

d56b304

Migrate SuggestBoxingForReturnImplTrait, Fix typo in infer_fn_conside…

23b8567

…r_casting

Migrate SuggestTuplePattern

d18adb7

Migrate TupleTrailingCommaSuggestion

b610ce7

FailureCode::Error0038 is unreachable, so can be removed

ab11b43

Migrate (most of) report_and_explain_type_error

1f09bc7

Update compiler/rustc_infer/src/infer/error_reporting/suggest.rs

e813b6d

Co-authored-by: David Wood <[email protected]>

Move and document escape_literal function

aa33a6f

Renamed TypeErrorAdditionalDiags (was Error0308Subdiags) and Obligati…

fd18d9a

…onCauseFailureCode (was FailureCodeDiagnostics)

A more general implementation of IntoDiagnosticArg for Binder (Al…

6a05cd8

…so removes `DiagArg`, as it's no longer necessary)

Extract suggest_specify_actual_length into a separate function

21d5bed

Rename tuple_wrap_err_subdiag to suggest_wrap_to_build_a_tuple, makin…

467d367

…g it more consistent with similar functions

Now passes tests

3fb6d6b

Collapse if statements, change message to lowercase

be44169

Add more complex test cases for new suggestion

5c5c3c9

Rewrite added diagnostics as translatable

18388c9

Start messages with lowercase

Change type and field name to be clearer

668a629

Revert "Don't recover lifetimes/labels containing emojis as character…

a047064

… literals" Reverts PR rust-lang#108031 Fixes (doesnt close until beta backported) rust-lang#109746 This reverts commit e3f9db5. This reverts commit 98b82ae. This reverts commit 380fa26.

Add regression test for rust-lang#104916

271ac7b

Signed-off-by: Yuki Okushi <[email protected]>

Call into_diagnostic_arg on Binder's contained value directly.

d07b1cd

Rollup merge of rust-lang#108698 - IntQuant:issue-100717-infer-6, r=d…

f2c7257

…avidtwco Migrating rustc_infer to session diagnostics (part 5) `@rustbot` label +A-translation cc rust-lang#100717

Dylan-DPC added 5 commits April 10, 2023 22:08

Rollup merge of rust-lang#109778 - petrochenkov:allkind, r=cjgillot

401429f

rustc_middle: Document which exactly `DefId`s don't have `DefKind`s I don't currently have time to investigate when and how to create these missing HIR nodes, but if someone else could do that it would be great.

Rollup merge of rust-lang#110147 - JohnTitor:issue-104916, r=compiler…

ab8b0ad

…-errors Add regression test for rust-lang#104916 Closes rust-lang#104916 I haven't tested if it still passes with debug assertions enabled so it'd be better to wait for CI to be green. r? compiler-errors

rustbot added 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. rollup A PR which is a rollup labels Apr 10, 2023

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 10, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 10, 2023

Mark-Simulacrum closed this Apr 13, 2023

Dylan-DPC deleted the rollup-7ni9q5v branch April 13, 2023 12:20

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 13, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 6 pull requests #110148

Rollup of 6 pull requests #110148

Dylan-DPC commented Apr 10, 2023

Dylan-DPC commented Apr 10, 2023

bors commented Apr 10, 2023

bors commented Apr 10, 2023

bors commented Apr 10, 2023

bors commented Apr 10, 2023

rust-timer commented Apr 10, 2023

bors commented Apr 13, 2023

Rollup of 6 pull requests #110148

Rollup of 6 pull requests #110148

Conversation

Dylan-DPC commented Apr 10, 2023

Dylan-DPC commented Apr 10, 2023

bors commented Apr 10, 2023

bors commented Apr 10, 2023

bors commented Apr 10, 2023

bors commented Apr 10, 2023

rust-timer commented Apr 10, 2023

Overall result: ❌ regressions - no action needed

Instruction count

Max RSS (memory usage)

Cycles

bors commented Apr 13, 2023