Rollup of 11 pull requests #117405

GuillaumeGomez · 2023-10-30T16:33:20Z

Successful merges:

rustdoc: elide cross-crate default generic arguments #112463 (rustdoc: elide cross-crate default generic arguments)
Clean up compiler/rustc*/Cargo.toml #117068 (Clean up compiler/rustc*/Cargo.toml)
On object safety error, mention new enum as alternative #117132 (On object safety error, mention new enum as alternative)
share some track_caller logic between interpret and codegen #117317 (share some track_caller logic between interpret and codegen)
Add support for mipsel-unknown-netbsd, 32-bit LE mips. #117356 (Add support for mipsel-unknown-netbsd, 32-bit LE mips.)
Rename a few remaining references to abort terminator #117357 (Rename a few remaining references to abort terminator)
C-variadic error improvements #117370 (C-variadic error improvements)
More rustc_interface cleanups #117376 (More rustc_interface cleanups)
improve and fix x install #117383 (improve and fix x install)
Fix unused variables lint issue for args in macro #117390 (Fix unused variables lint issue for args in macro)
Fix missing leading space in suggestion #117395 (Fix missing leading space in suggestion)

r? @ghost
@rustbot modify labels: rollup

…share some code

Follow up to e3f2edc

The comment explains it's for `unstable_offset_of`, but `offset_of` is now stable.

- Sort dependencies and features sections. - Add `tidy` markers to the sorted sections so they stay sorted. - Remove empty `[lib`] sections. - Remove "See more keys..." comments. Excluded files: - rustc_codegen_{cranelift,gcc}, because they're external. - rustc_lexer, because it has external use. - stable_mir, because it has external use.

When we encounter a `dyn Trait` that isn't object safe, look for its implementors. If there's one, mention using it directly If there are less than 9, mention the possibility of creating a new enum and using that instead. Account for object unsafe `impl Trait on dyn Trait {}`. Make a distinction between public and sealed traits. Fix rust-lang#80194.

By storing the unparsed values in `Config` and then parsing them within `run_compiler`, the parsing functions can use the main symbol interner, and not create their own short-lived interners. This change also eliminates the need for one `EarlyErrorHandler` in rustdoc, because parsing errors can be reported by another, slightly later `EarlyErrorHandler`.

They now only ever contains symbols.

It was added in 51938c6, a commit with a 7,720 line diff and a one line commit message. Even then the comment was incorrect; there was a removed a `build_output_filenames` call with a `&[]` argument in rustdoc, but the commit removed that call. In such a large commit, it's easy for small errors to occur.

Using `find` and `any` from `std` makes the code shorter and clearer.

Fix: Write access check of `prefix` and `sysconfdir` when DESTDIR is present. Improvement: Instead of repeatedly reading `DESTDIR` within each `fn prepare_dir` usage, read it once and pass it to the `fn prepare_dir`. Signed-off-by: onur-ozkan <work@onurozkan.dev>

- The early return can be right at the top. - The control flow is simplified with `if let`. - The `collect` isn't necessary. - The "Unconditionally" comment is erroneously duplicated from `check_attr_crate_type`, and can be removed.

For a local pattern with no space between `let` and `(` e.g.: let(_a) = 3; we were previously suggesting this illegal code: let_a =3; After this change the suggestion will instead be: let _a =3; (Note the space after `let`)

If a function incorrectly contains multiple `...` args, and is also not foreign or `unsafe extern "C"`, only emit the latter error once.

Trying to use C-variadics in a const function would previously fail with an error like "destructor of `VaListImpl<'_>` cannot be evaluated at compile-time". Add an explicit check for const C-variadics to provide a clearer error: "functions cannot be both `const` and C-variadic".

…en-args, r=GuillaumeGomez rustdoc: elide cross-crate default generic arguments Elide cross-crate generic arguments if they coincide with their default. TL;DR: Most notably, no more `Box<…, Global>` in `std`'s docs, just `Box<…>` from now on. Fixes rust-lang#80379. Also helps with rust-lang#44306. Follow-up to rust-lang#103885, rust-lang#107637. r? ``@ghost``

…=wesleywiser Clean up `compiler/rustc*/Cargo.toml` Mostly by sorting dependencies, plus some other minor things. r? ``@wesleywiser``

On object safety error, mention new enum as alternative When we encounter a `dyn Trait` that isn't object safe, look for its implementors. If there's one, mention using it directly If there are less than 9, mention the possibility of creating a new enum and using that instead. Fix rust-lang#80194.

share some track_caller logic between interpret and codegen Also move the code that implements the track_caller intrinsics out of the core interpreter engine -- it's just a helper creating a const-allocation, doesn't need to be part of the interpreter core.

Add support for mipsel-unknown-netbsd, 32-bit LE mips.

bors · 2023-10-30T18:03:38Z

⌛ Testing commit 9e4ab9f with merge 9487adc...

…llaumeGomez Rollup of 11 pull requests Successful merges: - rust-lang#112463 (rustdoc: elide cross-crate default generic arguments) - rust-lang#117068 (Clean up `compiler/rustc*/Cargo.toml`) - rust-lang#117132 (On object safety error, mention new enum as alternative) - rust-lang#117317 (share some track_caller logic between interpret and codegen) - rust-lang#117356 (Add support for mipsel-unknown-netbsd, 32-bit LE mips.) - rust-lang#117357 (Rename a few remaining references to abort terminator) - rust-lang#117370 (C-variadic error improvements) - rust-lang#117376 (More `rustc_interface` cleanups) - rust-lang#117383 (improve and fix `x install`) - rust-lang#117390 (Fix unused variables lint issue for args in macro) - rust-lang#117395 (Fix missing leading space in suggestion) r? `@ghost` `@rustbot` modify labels: rollup

bors · 2023-10-30T18:06:31Z

💔 Test failed - checks-actions

rust-log-analyzer · 2023-10-30T18:06:51Z

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

fmease · 2023-10-30T18:14:44Z

@bors retry

bors · 2023-10-30T18:47:59Z

⌛ Testing commit 9e4ab9f with merge 236ac91...

bors · 2023-10-30T20:49:04Z

☀️ Test successful - checks-actions
Approved by: GuillaumeGomez
Pushing 236ac91 to master...

rust-timer · 2023-10-30T20:52:09Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#112463	rustdoc: elide cross-crate default generic arguments	`e382c888ccb4f8aefad257ef064a869a20809d8e` (link)
#117068	Clean up `compiler/rustc*/Cargo.toml`	`2a7761ae82e4dd3e1a006d5e1e79f51142dace4a` (link)
#117132	On object safety error, mention new enum as alternative	`33ef793885b4598d696e55eebd9afbcc4d97df84` (link)
#117317	share some track_caller logic between interpret and codegen	`29bf5f4b52e57197eccffa8faa8eedab1b215b8f` (link)
#117356	Add support for mipsel-unknown-netbsd, 32-bit LE mips.	`ad063e8649def16f97dc2762121055b9aed5d85c` (link)
#117357	Rename a few remaining references to abort terminator	`ba19c99b576a49c72814c93da0a926937e769028` (link)
#117370	C-variadic error improvements	`4600d8ad228e226624d6981ec1e65a75b62b34d2` (link)
#117376	More `rustc_interface` cleanups	`cb6c0c0b37639351e49056c9a6d0640d17c6fe12` (link)
#117383	improve and fix `x install`	`83979fafa52529307b5e5e5dcdf9b589de49b6ea` (link)
#117390	Fix unused variables lint issue for args in macro	`fc21512d148d56934a9ec6a44148c65e2fd942a2` (link)
#117395	Fix missing leading space in suggestion	`f946ef9290445ce2fe9d52384da7e31577f11aee` (link)

previous master: e6e931dda5

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

rust-timer · 2023-10-30T23:26:47Z

Finished benchmarking commit (236ac91): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

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)	1.1%	[0.5%, 2.1%]	6
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-1.9%	[-1.9%, -1.9%]	1
Improvements ✅ (secondary)	-2.6%	[-2.6%, -2.6%]	1
All ❌✅ (primary)	0.6%	[-1.9%, 2.1%]	7

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 635.955s -> 635.333s (-0.10%)
Artifact size: 304.44 MiB -> 304.43 MiB (-0.00%)

RalfJung and others added 30 commits October 28, 2023 15:40

interpret: call caller_location logic the same way codegen does, and …

351d532

…share some code

share the track_caller handling within a mir::Body

04fa124

Rename a few remaining references to abort terminator

552abdc

Follow up to e3f2edc

Add support for mipsel-unknown-netbsd, 32-bit LE mips.

82b447a

mipsel_unknown_netbsd.rs: fix indentation.

5e6c313

Remove memoffset dependency from rustc_query_impl.

28e60de

The comment explains it's for `unstable_offset_of`, but `offset_of` is now stable.

Reduce exposure of cfg parsers.

bfcff79

Change cfg parsers to produce symbols instead of strings.

8e4ac98

Make Cfg and CheckCfg non-generic.

5c6a12c

They now only ever contains symbols.

Improve readability of parse_check_cfg.

371f972

Wrap some overlong comments.

a60d643

Remove check_output.

95b0088

Using `find` and `any` from `std` makes the code shorter and clearer.

Streamline collect_crate_types.

be8fd8b

- The early return can be right at the top. - The control flow is simplified with `if let`. - The `collect` isn't necessary. - The "Unconditionally" comment is erroneously duplicated from `check_attr_crate_type`, and can be removed.

Remove an unnecessary drop.

90862f6

Streamline some use items.

0c381ec

Fix missing leading space in suggestion

a2486db

For a local pattern with no space between `let` and `(` e.g.: let(_a) = 3; we were previously suggesting this illegal code: let_a =3; After this change the suggestion will instead be: let _a =3; (Note the space after `let`)

Fix rust-lang#117284, Fix unused variables lint issue for args in macro

82f34fd

Fix bad-c-variadic error being emitted multiple times

8508e65

If a function incorrectly contains multiple `...` args, and is also not foreign or `unsafe extern "C"`, only emit the latter error once.

rustdoc: elide cross-crate default generic arguments

58a80c8

Rollup merge of rust-lang#117068 - nnethercote:clean-up-Cargo-toml, r…

824e367

…=wesleywiser Clean up `compiler/rustc*/Cargo.toml` Mostly by sorting dependencies, plus some other minor things. r? ``@wesleywiser``

Rollup merge of rust-lang#117356 - he32:netbsd-mipsel, r=oli-obk

99b032f

Add support for mipsel-unknown-netbsd, 32-bit LE mips.

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 Oct 30, 2023

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 30, 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 Oct 30, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 30, 2023

bors merged commit 236ac91 into rust-lang:master Oct 30, 2023
12 checks passed

rustbot added this to the 1.75.0 milestone Oct 30, 2023

github-actions bot mentioned this pull request Oct 31, 2023

Automated pull from upstream master ferrocene/ferrocene#74

Merged

GuillaumeGomez deleted the rollup-i3jxtwh branch October 31, 2023 11:57

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 11 pull requests #117405

Rollup of 11 pull requests #117405

GuillaumeGomez commented Oct 30, 2023

bors commented Oct 30, 2023

bors commented Oct 30, 2023

rust-log-analyzer commented Oct 30, 2023

fmease commented Oct 30, 2023

bors commented Oct 30, 2023

bors commented Oct 30, 2023

rust-timer commented Oct 30, 2023

rust-timer commented Oct 30, 2023

Rollup of 11 pull requests #117405

Rollup of 11 pull requests #117405

Conversation

GuillaumeGomez commented Oct 30, 2023

bors commented Oct 30, 2023

bors commented Oct 30, 2023

rust-log-analyzer commented Oct 30, 2023

fmease commented Oct 30, 2023

bors commented Oct 30, 2023

bors commented Oct 30, 2023

rust-timer commented Oct 30, 2023

rust-timer commented Oct 30, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size