Rollup of 6 pull requests #111248

Dylan-DPC · 2023-05-05T13:10:36Z

Successful merges:

Fix checked_{add,sub}_duration incorrectly returning None when other has more than i64::MAX seconds #103056 (Fix checked_{add,sub}_duration incorrectly returning None when other has more than i64::MAX seconds)
Implement RFC 3348, c"foo" literals #108801 (Implement RFC 3348, c"foo" literals)
Reduce MIR dump file count for MIR-opt tests #110773 (Reduce MIR dump file count for MIR-opt tests)
Added default target cpu to --print target-cpus output and updated docs #110876 (Added default target cpu to --print target-cpus output and updated docs)
Improve check-cfg implementation #111068 (Improve check-cfg implementation)
btree_map: Cursor{,Mut}::peek_prev must agree #111238 (btree_map: Cursor{,Mut}::peek_prev must agree)

Failed merges:

Implement builtin # syntax and use it for offset_of!(...) #110694 (Implement builtin # syntax and use it for offset_of!(...))

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

…ther` has more than `i64::MAX` seconds

blessed new test

Our `Cursor::peek_prev` and `CursorMut::peek_prev` must agree on how to behave when they are called on the "null element".

This is done to simplify to relationship between names() and values() but also make thing clearer (having an Any to represent that any values are allowed) but also to allow the (none) + values expected cases that wasn't possible before.

Fix `checked_{add,sub}_duration` incorrectly returning `None` when `other` has more than `i64::MAX` seconds Use `checked_{add,sub}_unsigned` in `checked_{add,sub}_duration` so that the correct result is returned when adding/subtracting durations with more than `i64::MAX` seconds.

…r-errors Implement RFC 3348, `c"foo"` literals RFC: rust-lang/rfcs#3348 Tracking issue: rust-lang#105723

Reduce MIR dump file count for MIR-opt tests As referenced in issue rust-lang#109502 , mir-opt tests previously used the -Zdump-mir=all flag, which generates very large output. This PR only dumps the passes under test, greatly reducing dump output.

Added default target cpu to `--print target-cpus` output and updated docs Added default target cpu info as requested in issue rust-lang#110647 and noted the new output in the documentation

…trochenkov Improve check-cfg implementation This PR makes multiple improvements into the implementation of check-cfg, it is a prerequisite to a follow-up PR that will introduce a simpler and more explicit syntax. The 2 main area of improvements are: 1. Internal representation of expected values: - now uses `FxHashSet<Option<Symbol>>` instead of `FxHashSet<Symbol>`, it made the no value expected case only possible when no values where in the `HashSet` which is now represented as `None` (same as cfg represent-it). - a enum with `Some` and `Any` makes it now clear if some values are expected or not, necessary for `feature` and `target_feature`. 2. Diagnostics: Improve the diagnostics in multiple case and fix case where a missing value could have had a new name suggestion instead of the value diagnostic; and some drive by improvements I highly recommend reviewing commit by commit. r? `@petrochenkov`

…-peek-prev, r=Amanieu btree_map: `Cursor{,Mut}::peek_prev` must agree Our `Cursor::peek_prev` and `CursorMut::peek_prev` must agree on how to behave when they are called on the "null element". This will fix rust-lang#111228. r? `@Amanieu`

Dylan-DPC · 2023-05-05T13:11:27Z

@bors r+ rollup=never p=5

bors · 2023-05-05T13:11:29Z

📌 Commit c99ab29 has been approved by Dylan-DPC

It is now in the queue for this repository.

bors · 2023-05-05T15:59:23Z

⌛ Testing commit c99ab29 with merge 4b94c23...

bors · 2023-05-05T18:48:00Z

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

rust-timer · 2023-05-05T18:49:44Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#111238	1b6b68db77bd748928790583e2764a332082d4a9
#111068	9a9c4cf3aeba2b2b937aae062db1d43304f13bf3
#110876	28e985bf208f252ea9fa49b38646d4434e7411c1
#110773	77a6054297cafab1a9fdd783ddf26919fe012a67
#108801	9a2ec88c4ccb1ba1bf255d9f6d3e1fda9751cc60
#103056	d984f03576ba2ff1cf4aecde66015370cfc70c06

previous master: 4a18324a4d

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-05-05T20:33:02Z

Finished benchmarking commit (4b94c23): comparison URL.

Overall result: ❌ regressions - 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.8%	[0.5%, 1.6%]	11
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

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)	3.4%	[2.1%, 4.6%]	3
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

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

Binary size

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.1%	[0.0%, 0.1%]	4
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.1%	[0.0%, 0.1%]	4

Bootstrap: 653.437s -> 654.226s (0.12%)

Mark-Simulacrum · 2023-05-16T12:37:26Z

Regression seems possibly real (at least, not seeing recovery since this landed), but in secondary benchmark and relatively small in magnitude, so does not seem to warrant further investigation.

beetrees and others added 27 commits October 14, 2022 15:13

Fix checked_{add,sub}_duration incorrectly returning None when `o…

5def753

…ther` has more than `i64::MAX` seconds

initial step towards implementing C string literals

8ff3903

update and add a few tests

76d1f93

fix TODO comments

a49570f

rm diag item, use lang item

d5e7206

refactor unescape

4c01d49

address comments

78e3455

try gating early, add non-ascii test

bf3ca59

make it semantic error

abb181d

fix tidy

6d905a8

make cook generic

d30c668

add passes to miroptfiles struct and passed to -zdump-mir args

c19959f

blessed new test

--print target-cpus shows default target cpu, updated docs

ea17aa9

moved default CPU message inline

9aa596a

change expect() to unwrap_or_else() and update msg

cb74cd5

added SAFETY comment

f239cd6

btree_map: Cursor{,Mut}::peek_prev must agree

00cb59b

Our `Cursor::peek_prev` and `CursorMut::peek_prev` must agree on how to behave when they are called on the "null element".

Use explicit instead of implicit control-flow for check-cfg parsing

ad6f4b7

Improve internal representation of check-cfg

d327d5b

This is done to simplify to relationship between names() and values() but also make thing clearer (having an Any to represent that any values are allowed) but also to allow the (none) + values expected cases that wasn't possible before.

Improve check-cfg diagnostics (part 1)

a5f8dba

Improve check-cfg diagnostics (part 2)

5364784

Rollup merge of rust-lang#108801 - fee1-dead-contrib:c-str, r=compile…

4891f02

…r-errors Implement RFC 3348, `c"foo"` literals RFC: rust-lang/rfcs#3348 Tracking issue: rust-lang#105723

Rollup merge of rust-lang#110876 - mj10021:issue-110647-fix, r=b-naber

65702bf

Added default target cpu to `--print target-cpus` output and updated docs Added default target cpu info as requested in issue rust-lang#110647 and noted the new output in the documentation

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-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels May 5, 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 May 5, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label May 5, 2023

bors merged commit 4b94c23 into rust-lang:master May 5, 2023

rustbot added this to the 1.71.0 milestone May 5, 2023

This was referenced May 5, 2023

Add Trusty OS as tier 3 target #103895

Closed

Implement builtin # syntax and use it for offset_of!(...) #110694

Merged

linker: Report linker flavors incompatible with the current target #110807

Merged

Add support for cfg(overflow_checks) #111096

Merged

rustbot added the perf-regression Performance regression. label May 5, 2023

Mark-Simulacrum added the perf-regression-triaged The performance regression has been triaged. label May 16, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 6 pull requests #111248

Rollup of 6 pull requests #111248

Dylan-DPC commented May 5, 2023

Dylan-DPC commented May 5, 2023

bors commented May 5, 2023

bors commented May 5, 2023

bors commented May 5, 2023

rust-timer commented May 5, 2023

rust-timer commented May 5, 2023

Mark-Simulacrum commented May 16, 2023

Rollup of 6 pull requests #111248

Rollup of 6 pull requests #111248

Conversation

Dylan-DPC commented May 5, 2023

Dylan-DPC commented May 5, 2023

bors commented May 5, 2023

bors commented May 5, 2023

bors commented May 5, 2023

rust-timer commented May 5, 2023

rust-timer commented May 5, 2023

Overall result: ❌ regressions - ACTION NEEDED

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Mark-Simulacrum commented May 16, 2023