Rollup of 5 pull requests #117459

matthiaskrgr · 2023-10-31T18:03:23Z

Successful merges:

rustdoc: Document lack of object safety on affected traits #113241 (rustdoc: Document lack of object safety on affected traits)
Turn const_caller_location from a query to a hook #117388 (Turn const_caller_location from a query to a hook)
Add a stable MIR visitor #117417 (Add a stable MIR visitor)
prepopulate opaque ty storage before using it #117439 (prepopulate opaque ty storage before using it)
Add support for pre-unix-epoch file dates on Apple platforms (#108277) #117451 (Add support for pre-unix-epoch file dates on Apple platforms (std::fs::Metadata timestamp methods will panic on files with invalid timestamp nsec values #108277))

r? @ghost
@rustbot modify labels: rollup

Add a few utility functions as well and extend most `mir` and `ty` ADTs to implement `PartialEq` and `Eq`.

…ng#108277) Time in UNIX system calls counts from the epoch, 1970-01-01. The timespec struct used in various system calls represents this as a number of seconds and a number of nanoseconds. Nanoseconds are required to be between 0 and 999_999_999, because the portion outside that range should be represented in the seconds field; if nanoseconds were larger than 999_999_999, the seconds field should go up instead. Suppose you ask for the time 1969-12-31, what time is that? On UNIX systems that support times before the epoch, that's seconds=-86400, one day before the epoch. But now, suppose you ask for the time 1969-12-31 23:59:00.1. In other words, a tenth of a second after one minute before the epoch. On most UNIX systems, that's represented as seconds=-60, nanoseconds=100_000_000. The macOS bug is that it returns seconds=-59, nanoseconds=-900_000_000. While that's in some sense an accurate description of the time (59.9 seconds before the epoch), that violates the invariant of the timespec data structure: nanoseconds must be between 0 and 999999999. This causes this assertion in the Rust standard library. So, on macOS, if we get a Timespec value with seconds less than or equal to zero, and nanoseconds between -999_999_999 and -1 (inclusive), we can add 1_000_000_000 to the nanoseconds and subtract 1 from the seconds, and then convert. The resulting timespec value is still accepted by macOS, and when fed back into the OS, produces the same results. (If you set a file's mtime with that timestamp, then read it back, you get back the one with negative nanoseconds again.) Co-authored-by: Josh Triplett <josh@joshtriplett.org>

…ty, r=GuillaumeGomez rustdoc: Document lack of object safety on affected traits Closes rust-lang#85138 I saw the issue didn't have any recent activity, if there is another MR for it I missed it. I want the issue to move forward so here is my proposition. It takes some space just before the "Implementors" section and only if the trait is **not** object safe since it is the only case where special care must be taken in some cases and this has the benefit of avoiding generation of HTML in (I hope) the common case.

Turn const_caller_location from a query to a hook blocked on rust-lang#117317 cc `@RalfJung`

Add a stable MIR visitor This change also adds a few utility functions as well and extend most `mir` and `ty` ADTs to implement `PartialEq` and `Eq`. Fixes rust-lang/project-stable-mir#32 r? `@oli-obk`

…er-errors prepopulate opaque ty storage before using it doesn't have any significant impact rn afaict, as we freely define new opaque types during MIR typeck. It will be relevant with rust-lang#117278 and once we stop allowing the definition of new opaques in MIR typeck r? `@compiler-errors`

…shtriplett Add support for pre-unix-epoch file dates on Apple platforms (rust-lang#108277) Please note that even though the assertion being hit is the same on MacOS and thus similar to what's described in rust-lang#108277, on MacOS it's possible to convert the numbers such that they are valid, don't hit the assertion and are round-trippable. Doing so effectively fixes the issue on Apple platforms. This PR does not attempt to harden other platforms against negative nanoseconds, which can happen for many reasons including mild filesystem corruption. ---- Time in UNIX system calls counts from the epoch, 1970-01-01. The timespec struct used in various system calls represents this as a number of seconds and a number of nanoseconds. Nanoseconds are required to be between 0 and 999_999_999, because the portion outside that range should be represented in the seconds field; if nanoseconds were larger than 999_999_999, the seconds field should go up instead. Suppose you ask for the time 1969-12-31, what time is that? On UNIX systems that support times before the epoch, that's seconds=-86400, one day before the epoch. But now, suppose you ask for the time 1969-12-31 23:59:00.1. In other words, a tenth of a second after one minute before the epoch. On most UNIX systems, that's represented as seconds=-60, nanoseconds=100_000_000. The macOS bug is that it returns seconds=-59, nanoseconds=-900_000_000. While that's in some sense an accurate description of the time (59.9 seconds before the epoch), that violates the invariant of the timespec data structure: nanoseconds must be between 0 and 999999999. This causes this assertion in the Rust standard library. So, on macOS, if we get a Timespec value with seconds less than or equal to zero, and nanoseconds between -999_999_999 and -1 (inclusive), we can add 1_000_000_000 to the nanoseconds and subtract 1 from the seconds, and then convert. The resulting timespec value is still accepted by macOS, and when fed back into the OS, produces the same results. (If you set a file's mtime with that timestamp, then read it back, you get back the one with negative nanoseconds again.) Co-authored-by: Josh Triplett <josh@joshtriplett.org>

matthiaskrgr · 2023-10-31T18:03:39Z

@bors r+ rollup=never p=5

bors · 2023-10-31T18:03:42Z

📌 Commit d06200b has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-10-31T19:07:34Z

⌛ Testing commit d06200b with merge d4ba274...

…iaskrgr Rollup of 5 pull requests Successful merges: - rust-lang#113241 (rustdoc: Document lack of object safety on affected traits) - rust-lang#117388 (Turn const_caller_location from a query to a hook) - rust-lang#117417 (Add a stable MIR visitor) - rust-lang#117439 (prepopulate opaque ty storage before using it) - rust-lang#117451 (Add support for pre-unix-epoch file dates on Apple platforms (rust-lang#108277)) r? `@ghost` `@rustbot` modify labels: rollup

bors · 2023-10-31T21:05:30Z

💔 Test failed - checks-actions

rust-log-analyzer · 2023-10-31T21:05:32Z

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

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

matthiaskrgr · 2023-10-31T21:24:24Z

@bors retry

bors · 2023-10-31T23:08:59Z

⌛ Testing commit d06200b with merge 09ac6e4...

bors · 2023-11-01T01:09:24Z

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 09ac6e4 to master...

rust-timer · 2023-11-01T01:10:50Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#113241	rustdoc: Document lack of object safety on affected traits	`1924f2d3512e2277ca86f5edbacb12d070ab2b41` (link)
#117388	Turn const_caller_location from a query to a hook	`fc1f10a1ede18965d201b00027054bd4ca30877f` (link)
#117417	Add a stable MIR visitor	`634fed0327063d6a7047c272412315da2065d403` (link)
#117439	prepopulate opaque ty storage before using it	`288910fe10e76fc50cac55e3eece44568583da6b` (link)
#117451	Add support for pre-unix-epoch file dates on Apple platform…	`2d5e7adb9f5c32f365902d074d9b69f2ab48a7f7` (link)

previous master: 9d83ac2179

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-11-01T02:32:19Z

Finished benchmarking commit (09ac6e4): comparison URL.

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

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
Regressions ❌ (secondary)	0.4%	[0.3%, 0.5%]	4
Improvements ✅ (primary)	-0.2%	[-0.3%, -0.1%]	3
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.2%	[-0.3%, -0.1%]	3

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
Regressions ❌ (secondary)	2.9%	[2.9%, 2.9%]	1
Improvements ✅ (primary)	-1.1%	[-1.1%, -1.1%]	1
Improvements ✅ (secondary)	-2.6%	[-2.6%, -2.6%]	1
All ❌✅ (primary)	-1.1%	[-1.1%, -1.1%]	1

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)	7.8%	[7.8%, 7.8%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Binary size

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

Bootstrap: 638.452s -> 638.855s (0.06%)
Artifact size: 304.50 MiB -> 304.47 MiB (-0.01%)

78: Automated pull from upstream `master` r=tshepang a=github-actions[bot] This PR pulls the following changes from the upstream repository: * rust-lang/rust#113970 * rust-lang/rust#117459 * rust-lang/rust#117451 * rust-lang/rust#117439 * rust-lang/rust#117417 * rust-lang/rust#117388 * rust-lang/rust#113241 * rust-lang/rust#117462 * rust-lang/rust#117450 * rust-lang/rust#117407 * rust-lang/rust#117444 * rust-lang/rust#117438 * rust-lang/rust#117421 * rust-lang/rust#117416 * rust-lang/rust#116712 * rust-lang/rust#116267 * rust-lang/rust#117377 * rust-lang/rust#117419 Co-authored-by: Alexis (Poliorcetics) Bourget <ab_github@poliorcetiq.eu> Co-authored-by: Esteban Küber <esteban@kuber.com.ar> Co-authored-by: David Tolnay <dtolnay@gmail.com> Co-authored-by: Celina G. Val <celinval@amazon.com> Co-authored-by: Michael Goulet <michael@errs.io> Co-authored-by: bors <bors@rust-lang.org> Co-authored-by: Camille GILLOT <gillot.camille@gmail.com> Co-authored-by: lcnr <rust@lcnr.de> Co-authored-by: Zalathar <Zalathar@users.noreply.github.com> Co-authored-by: Oli Scherer <git-spam-no-reply9815368754983@oli-obk.de>

pnkfelix · 2023-11-07T19:05:43Z

regressons are all minor and to variants of secondary benchmark coercions
marking as triaged

@rustbot label: +perf-regression-triaged

poliorcetics and others added 12 commits October 29, 2023 22:57

feat: render Object Safety informations non-object safe traits

51e22be

feat: Add 'object-safety' ID to init_id_map() in rustdoc

40556b9

tests: object-safety section in traits

a119158

Add a stable MIR visitor

af7472e

Add a few utility functions as well and extend most `mir` and `ty` ADTs to implement `PartialEq` and `Eq`.

prepopulate opaque ty storage before using it :>

078144e

Turn const_caller_location from a query to a hook

77174d3

Rollup merge of rust-lang#117388 - oli-obk:dequerification, r=RalfJung

83990ba

Turn const_caller_location from a query to a hook blocked on rust-lang#117317 cc `@RalfJung`

Rollup merge of rust-lang#117417 - celinval:smir-visitor, r=oli-obk

290daf9

Add a stable MIR visitor This change also adds a few utility functions as well and extend most `mir` and `ty` ADTs to implement `PartialEq` and `Eq`. Fixes rust-lang/project-stable-mir#32 r? `@oli-obk`

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 31, 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 31, 2023

bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 31, 2023

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 31, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 1, 2023

bors merged commit 09ac6e4 into rust-lang:master Nov 1, 2023
11 checks passed

rustbot added this to the 1.75.0 milestone Nov 1, 2023

This was referenced Nov 1, 2023

new solver normalization improvements #117278

Merged

Move platform modules into sys::pal #117285

Merged

Do not assert in op_to_const. #117441

Merged

rustbot added the perf-regression Performance regression. label Nov 1, 2023

github-actions bot mentioned this pull request Nov 1, 2023

Automated pull from upstream master ferrocene/ferrocene#78

Merged

rustbot added the perf-regression-triaged The performance regression has been triaged. label Nov 7, 2023

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 5 pull requests #117459

Rollup of 5 pull requests #117459

matthiaskrgr commented Oct 31, 2023

matthiaskrgr commented Oct 31, 2023

bors commented Oct 31, 2023

bors commented Oct 31, 2023

bors commented Oct 31, 2023

rust-log-analyzer commented Oct 31, 2023

matthiaskrgr commented Oct 31, 2023

bors commented Oct 31, 2023

bors commented Nov 1, 2023

rust-timer commented Nov 1, 2023

rust-timer commented Nov 1, 2023

pnkfelix commented Nov 7, 2023 •

edited

Loading

Rollup of 5 pull requests #117459

Rollup of 5 pull requests #117459

Conversation

matthiaskrgr commented Oct 31, 2023

matthiaskrgr commented Oct 31, 2023

bors commented Oct 31, 2023

bors commented Oct 31, 2023

bors commented Oct 31, 2023

rust-log-analyzer commented Oct 31, 2023

matthiaskrgr commented Oct 31, 2023

bors commented Oct 31, 2023

bors commented Nov 1, 2023

rust-timer commented Nov 1, 2023

rust-timer commented Nov 1, 2023

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Instruction count

Max RSS (memory usage)

Cycles

Binary size

pnkfelix commented Nov 7, 2023 • edited Loading

pnkfelix commented Nov 7, 2023 •

edited

Loading