Rollup of 8 pull requests by matthiaskrgr · Pull Request #109538 · rust-lang/rust

matthiaskrgr · 2023-03-23T18:55:47Z

Successful merges:

Clarify Error::last_os_error can be weird #106964 (Clarify Error::last_os_error can be weird)
Add -Z time-passes-format to allow specifying a JSON output for -Z time-passes #107718 (Add -Z time-passes-format to allow specifying a JSON output for -Z time-passes)
Lint ambiguous glob re-exports #107880 (Lint ambiguous glob re-exports)
Remove issue number for link_cfg #108549 (Remove issue number for link_cfg)
Fix the ffi_unwind_calls lint documentation #108588 (Fix the ffi_unwind_calls lint documentation)
Add try_canonicalize to rustc_fs_util and use it over fs::canonicalize #109231 (Add try_canonicalize to rustc_fs_util and use it over fs::canonicalize)
Add parentheses properly for method calls #109472 (Add parentheses properly for method calls)
Move useless_anynous_reexport lint into unused_imports #109487 (Move useless_anynous_reexport lint into unused_imports)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Fundamentally, querying the OS for error codes is a process that is deeply subject to the whims of chance and fortune. We can account for OS, but not for every combination of platform APIs. A compiled binary may not recognize new errors introduced years later. We should clarify a few especially odd situations, and what they mean: We can effectively promise nothing. This allows removing mention of ErrorKind::Uncategorized. That error variant is hidden quite deliberately, so we should not explicitly mention it.

If a lint example has an `ignore` tag, but the lint author also includes the {{produces}} marker, then the output will just contain the text `{{produces}}`. This adds a check for this mistake and provides help on how the lint docs should be written.

Some examples may contain multiple lines which trigger the lint. Previously it would only display the first message. This updates it so that all matching instances of the lint are displayed.

…calize`

… time-passes`

…idden-documentation, r=ChrisDenton Clarify `Error::last_os_error` can be weird Fundamentally, querying the OS for error codes is a process that is deeply subject to the whims of chance and fortune. We can account for OS, but not for every combination of platform APIs. A compiled binary may not recognize new errors introduced years later. We should clarify a few especially odd situations, and what they mean: We can effectively promise nothing... if you ask for Rust to decode errors where none have occurred. This allows removing mention of ErrorKind::Uncategorized. That error variant is hidden deliberately, so we should not explicitly mention it. This fixes rust-lang#106937. Since you had an opinion also: Does this solution seem acceptable? r? ``@ChrisDenton``

Add `-Z time-passes-format` to allow specifying a JSON output for `-Z time-passes` This adds back the `-Z time` option as that is useful for [my rustc benchmark tool](https://github.com/Zoxc/rcb), reverting rust-lang#102725. It now uses nanoseconds and bytes as the units so it is renamed to `time-precise`.

Lint ambiguous glob re-exports Attempts to fix rust-lang#107563. We currently already emit errors for ambiguous re-exports when two names are re-exported *specifically*, i.e. not from glob exports. This PR attempts to emit deny-by-default lints for ambiguous glob re-exports.

Remove issue number for `link_cfg` Fixes rust-lang#72059 Per rust-lang#37406 and its [unstable book entry](https://doc.rust-lang.org/beta/unstable-book/language-features/link-cfg.html), this is an internal feature, and therefore perma-unstable and not being tracked

Fix the ffi_unwind_calls lint documentation This fixes the [`ffi_unwind_calls`](https://doc.rust-lang.org/nightly/rustc/lints/listing/allowed-by-default.html#ffi-unwind-calls) documentation to show its output correctly. Currently it is showing the text `{{produces}}` which is not how it should look. This fixes it by not ignoring the example. I'm not sure why it was ignored, as the way the lint currently works it doesn't seem to require external linkage. This also fixes several mistakes in the example: * There is no `ffi_unwind_calls` feature. * Denies the lint (which is otherwise allow be default). * Removes the `mod impl` which is not valid Rust syntax, and doesn't appear to be needed anyways. The output now looks like: ``` warning: call to foreign function with FFI-unwind ABI --> lint_example.rs:10:14 | 10 | unsafe { foo(); } | ^^^^^ call to foreign function with FFI-unwind ABI | note: the lint level is defined here --> lint_example.rs:2:9 | 2 | #![warn(ffi_unwind_calls)] | ^^^^^^^^^^^^^^^^ warning: call to function pointer with FFI-unwind ABI --> lint_example.rs:12:14 | 12 | unsafe { ptr(); } | ^^^^^ call to function pointer with FFI-unwind ABI ``` This also includes some updates to the lint-docs tool to help with this issue: * Adds a check if a lint documentation has `{{produces}}` with an ignored example, and generates an error. * All instances of a lint are now displayed. Previously it only showed the first time the lint fires. Some examples may trigger a lint multiple times, and they are all now displayed.

Add `try_canonicalize` to `rustc_fs_util` and use it over `fs::canonicalize` This adds `try_canonicalize` which tries to call `fs::canonicalize`, but falls back to `std::path::absolute` if it fails. Existing `canonicalize` calls are replaced with it. `fs::canonicalize` is not guaranteed to work on Windows.

Add parentheses properly for method calls Fixes rust-lang#109436

…rt-check, r=petrochenkov Move useless_anynous_reexport lint into unused_imports As mentioned in rust-lang#109003, this check should have been merged with `unused_imports` in the start. r? `@petrochenkov`

matthiaskrgr · 2023-03-23T18:56:04Z

@bors r+ rollup=never p=8

bors · 2023-03-23T18:56:06Z

📌 Commit 3961ef5 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-03-23T21:17:00Z

⌛ Testing commit 3961ef5 with merge 1459b31...

bors · 2023-03-23T23:53:49Z

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 1459b31 to master...

rust-timer · 2023-03-23T23:56:10Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#109487	9611752e3cff01e61a1bede4e59ee77d25df38af
#109472	1f9a0ec88295b326662c34b4c76bb8b95ed36d8a
#109231	ef3891f14c64d2b024137296cb328d27ddd8857a
#108588	4fc5fd8ca6318da8f295b11fa4d6232744efea8a
#108549	817c6c6ca4041698603490ae868907b4e298cfab
#107880	d032baed9fc65868131da08f2ebd1b76f8e2a0c0
#107718	21dc4d1ea4debfd436585e82ed0f847fe25bf908
#106964	794270cbc8c1947ef038bf513eaf355f2e33a147

previous master: e216300876

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-03-24T05:30:03Z

Finished benchmarking commit (1459b31): 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%	[1.1%, 1.1%]	1
Regressions ❌ (secondary)	0.9%	[0.9%, 0.9%]	1
Improvements ✅ (primary)	-3.6%	[-3.6%, -3.6%]	1
Improvements ✅ (secondary)	-2.3%	[-4.2%, -0.7%]	21
All ❌✅ (primary)	-1.2%	[-3.6%, 1.1%]	2

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.8%	[0.5%, 1.5%]	4
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.4%	[-0.5%, -0.4%]	2
All ❌✅ (primary)	-	-	0

workingjubilee and others added 23 commits January 16, 2023 20:58

Remove issue number for link_cfg

e7c8af4

Fix the ffi_unwind_calls lint documentation

15450b1

Collect all matching messages for a lint.

ab2508a

Some examples may contain multiple lines which trigger the lint. Previously it would only display the first message. This updates it so that all matching instances of the lint are displayed.

Add try_canonicalize to rustc_fs_util and use it over `fs::canoni…

4f7cd3d

…calize`

Remove irrelevant docs on error kinds

0f32fd8

Lint ambiguous glob re-exports

1f67949

Reduce output spam

b0dc15c

Add -Z time-passes-format to allow specifying a JSON output for `-Z…

f60d2eb

… time-passes`

Remove unique and move VerboseTimingGuard fields into a new struct

6c57dda

Fixes rust-lang#109436: add parentheses properly

20f3f43

Move useless_anynous_reexport lint into unused_imports

825f088

Update anonymous-reexport UI test

e03b13c

Use span_look_ahead instead of next_point

2580348

Rollup merge of rust-lang#109472 - MU001999:patch-3, r=eholk

dddede4

Add parentheses properly for method calls Fixes rust-lang#109436

Rollup merge of rust-lang#109487 - GuillaumeGomez:move-useless-reexpo…

3961ef5

…rt-check, r=petrochenkov Move useless_anynous_reexport lint into unused_imports As mentioned in rust-lang#109003, this check should have been merged with `unused_imports` in the start. r? `@petrochenkov`

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 Mar 23, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 23, 2023

bors merged commit 1459b31 into rust-lang:master Mar 23, 2023

rustbot added this to the 1.70.0 milestone Mar 23, 2023

bors mentioned this pull request Mar 24, 2023

Add internal_features lint #108955

Merged

andreievg mentioned this pull request Jul 7, 2023

Rust v1.70.0 ambiguous re exports msupply-foundation/open-msupply#1974

Closed

matthiaskrgr deleted the rollup-ct58npj branch March 16, 2024 18:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 8 pull requests#109538

Rollup of 8 pull requests#109538
bors merged 23 commits intorust-lang:masterfrom
matthiaskrgr:rollup-ct58npj

matthiaskrgr commented Mar 23, 2023

Uh oh!

matthiaskrgr commented Mar 23, 2023

Uh oh!

bors commented Mar 23, 2023

Uh oh!

bors commented Mar 23, 2023

Uh oh!

bors commented Mar 23, 2023

Uh oh!

rust-timer commented Mar 23, 2023

Uh oh!

rust-timer commented Mar 24, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

Uh oh!

Conversation

matthiaskrgr commented Mar 23, 2023

Uh oh!

matthiaskrgr commented Mar 23, 2023

Uh oh!

bors commented Mar 23, 2023

Uh oh!

bors commented Mar 23, 2023

Uh oh!

bors commented Mar 23, 2023

Uh oh!

rust-timer commented Mar 23, 2023

Uh oh!

rust-timer commented Mar 24, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants