Rollup of 8 pull requests #104573

matthiaskrgr · 2022-11-18T13:13:40Z

Successful merges:

Migrate rustc_resolve to use SessionDiagnostic, part # 1 #101162 (Migrate rustc_resolve to use SessionDiagnostic, part # 1)
Don't allow CoerceUnsized into dyn* (except for trait upcasting) #103386 (Don't allow CoerceUnsized into dyn* (except for trait upcasting))
Detect incorrect chaining of if and if let conditions and recover #103405 (Detect incorrect chaining of if and if let conditions and recover)
Fix non-associativity of Instant math on aarch64-apple-darwin targets #103594 (Fix non-associativity of Instant math on aarch64-apple-darwin targets)
Add variant_name function to LangItem #104006 (Add variant_name function to LangItem)
Migrate GUI test to use functions #104494 (Migrate GUI test to use functions)
rustdoc: clean up sidebar width CSS #104516 (rustdoc: clean up sidebar width CSS)
fix a typo #104550 (fix a typo)

Failed merges:

Use ErrorGuaranteed::unchecked_claim_error_was_emitted less #104554 (Use ErrorGuaranteed::unchecked_claim_error_was_emitted less)

r? @ghost
@rustbot modify labels: rollup

@compiler-errors

implement binding_shadows migrate till self-in-generic-param-default use braces in fluent message as suggested by @compiler-errors. to fix lock file issue reported by CI migrate 'unreachable label' error run formatter name the variables correctly in fluent file SessionDiagnostic -> Diagnostic test "pattern/pat-tuple-field-count-cross.rs" passed test "resolve/bad-env-capture2.rs" passed test "enum/enum-in-scope.rs" and other depended on "resolve_binding_shadows_something_unacceptable" should be passed now. fix crash errors while running test-suite. there might be more. then_some(..) suits better here. all tests passed convert TraitImpl and InvalidAsm. TraitImpl is buggy yet. will fix after receiving help from Zulip migrate "Ralative-2018" migrate "ancestor only" migrate "expected found" migrate "Indeterminate" migrate "module only" revert to the older implementation for now. since this is failing at the moment. follow the convension for fluent variable order the diag attribute as suggested in review comment fix merge error. migrate trait-impl-duplicate make the changes compatible with "Flatten diagnostic slug modules rust-lang#103345" fix merge remove commented code merge issues fix review comments fix tests

…gets

…itions

This commit takes advantage of the ability to set [flex-basis] to a specific length instead of setting it to `auto` and changing min-/max-width, and setting flex-grow/-shrink both to 0. [flex-basis]: https://developer.mozilla.org/en-US/docs/Web/CSS/flex-basis

Clippy has an internal lint that checks for the usage of hardcoded def paths and suggests to replace them with a lang or diagnostic item, if possible. This was implemented with a hack, by getting all the variants of the `LangItem` enum and then index into it with the position of the `LangItem` in the `items` list. This is no longer possible, because the `items` list can't be accessed anymore.

Migrate rustc_resolve to use SessionDiagnostic, part # 1 crate a somewhat on larger size, so plz allow some time to get it finished.

…o-dynstar, r=eholk Don't allow `CoerceUnsized` into `dyn*` (except for trait upcasting) This makes sure we don't accidentally allow coercions like `Box<T>` -> `Box<dyn* Trait>`, or in the case of this ICE, `&T` to `&dyn* Trait`. These coercions don't make sense, at least not via the `CoerceUnsized` trait. Fixes rust-lang#102172 Fixes rust-lang#102429

…f, r=compiler-errors Detect incorrect chaining of if and if let conditions and recover Fixes rust-lang#103381

Fix non-associativity of `Instant` math on `aarch64-apple-darwin` targets This is a duplicate of rust-lang#94100 (since the original author is unresponsive), which resolves rust-lang#91417. On `aarch64-apple-darwin` targets, the internal resolution of `Instant` is lower than that of `Duration`, so math between them becomes non-associative with small-enough durations. This PR makes this target use the standard Unix implementation (where `Instant` has 1ns resolution), but with `CLOCK_UPTIME_RAW` so it still returns the same values as `mach_absolute_time`[^1]. (Edit: I need someone to confirm that this still works, I do not have access to an M1 device.) [^1]: https://www.manpagez.com/man/3/clock_gettime/

Add variant_name function to `LangItem` Clippy has an internal lint that checks for the usage of hardcoded def paths and suggests to replace them with a lang or diagnostic item, if possible. This was implemented with a hack, by getting all the variants of the `LangItem` enum and then index into it with the position of the `LangItem` in the `items` list. This is no longer possible, because the `items` list can't be accessed anymore. Follow up to rust-lang#103603 cc `@camsteffen` r? `@oli-obk` This is blocking the sync between Clippy and Rust. I'm not sure if this is the best solution here, or if I should add a method `items()` to `LanguageItems` and keep the code in Clippy unchanged.

…-func, r=notriddle Migrate GUI test to use functions r? `@notriddle`

…ebar-width, r=GuillaumeGomez rustdoc: clean up sidebar width CSS This commit takes advantage of the ability to set [flex-basis] to a specific length instead of setting it to `auto` and changing min-/max-width, and setting flex-grow/-shrink both to 0. This PR should not cause any visual changes. preview: https://notriddle.com/notriddle-rustdoc-demos/flex-basis-sidebar-width/std/index.html [flex-basis]: https://developer.mozilla.org/en-US/docs/Web/CSS/flex-basis

fix a typo r? `@lcnr`

matthiaskrgr · 2022-11-18T13:14:15Z

@bors r+ rollup=never p=8

bors · 2022-11-18T13:14:17Z

📌 Commit 7e5e520 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2022-11-18T16:12:32Z

⌛ Testing commit 7e5e520 with merge 6d1f72cef0ba4187d297b791ee635bba5e032729...

bors · 2022-11-18T16:56:03Z

💔 Test failed - checks-actions

matthiaskrgr · 2022-11-18T16:57:55Z

@bors retry #104563

rust-log-analyzer · 2022-11-18T17:22:44Z

The job x86_64-mingw-1 failed! Check out the build log: (web) (plain)

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

test str::utf8_char_counts ... ok

failures:

---- rc::rc_from_vec_opt stdout ----
thread 'rc::rc_from_vec_opt' panicked at 'assertion failed: `(left == right)`
  left: `-68544`,
 right: `16`: Vector allocation not reused', library\alloc\tests\rc.rs:217:9

failures:
    rc::rc_from_vec_opt


test result: FAILED. 652 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out; finished in 1.61s

error: test failed, to rerun pass `-p alloc --test collectionstests`
Build completed unsuccessfully in 0:38:01
make: *** [Makefile:83: ci-mingw-subset-1] Error 1

bors · 2022-11-18T20:27:01Z

⌛ Testing commit 7e5e520 with merge b833ad5...

bors · 2022-11-18T23:20:46Z

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

rust-timer · 2022-11-18T23:23:02Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#104550	48ded332db5c7ccd78e2e9f6841fb95aa151c3df
#104516	ddf4c42df2b33d4432511cf0dfe823d9062cc67c
#104494	663d321c244c32c33a6ee812f1806c8bab1f9364
#104006	5678be5bbd2fbcdf23c2afa5e89b3cc872ce204c
#103594	babb0d554142e21ef0ac09e99733f09ffb5707f2
#103405	42fe25cfd5c26ac5d6787bba231f988c2b9833e1
#103386	0c0d344ae96ab5474dc1350b36ff8ed116dc12be
#101162	7bd13c4738a4cdcf2ad590b4bc90998e1bf0353d

previous master: 70fe5f08ff

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 · 2022-11-19T00:39:15Z

Finished benchmarking commit (b833ad5): 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)	-	-	0
Regressions ❌ (secondary)	2.7%	[2.7%, 2.7%]	1
Improvements ✅ (primary)	-1.2%	[-1.2%, -1.2%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-1.2%	[-1.2%, -1.2%]	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)	-	-	0
Improvements ✅ (primary)	-1.5%	[-2.3%, -0.6%]	2
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-1.5%	[-2.3%, -0.6%]	2

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#101162 (Migrate rustc_resolve to use SessionDiagnostic, part # 1) - rust-lang#103386 (Don't allow `CoerceUnsized` into `dyn*` (except for trait upcasting)) - rust-lang#103405 (Detect incorrect chaining of if and if let conditions and recover) - rust-lang#103594 (Fix non-associativity of `Instant` math on `aarch64-apple-darwin` targets) - rust-lang#104006 (Add variant_name function to `LangItem`) - rust-lang#104494 (Migrate GUI test to use functions) - rust-lang#104516 (rustdoc: clean up sidebar width CSS) - rust-lang#104550 (fix a typo) Failed merges: - rust-lang#104554 (Use `ErrorGuaranteed::unchecked_claim_error_was_emitted` less) r? `@ghost` `@rustbot` modify labels: rollup

compiler-errors and others added 21 commits November 10, 2022 23:25

Don't allow implement CoerceUnsized into dyn-star

0af211a

Don't CoerceUnsized dyn* to dyn*

6e6c49e

Unbreak upcasting

4f978db

Fix non-associativity of Instant math on aarch64-apple-darwin tar…

5008a31

…gets

just use libc::clockid_t

015ab65

macos, aarch64, and not(miri)

f4f5159

fix rust-lang#103381, Detect incorrect chaining of if and if let cond…

74c9a6c

…itions

move testcase for tidy

cd2bde1

Migrate GUI test to use functions

23e5fa1

fix a typo

ff38c28

Rollup merge of rust-lang#101162 - rajputrajat:master, r=davidtwco

3e59657

Migrate rustc_resolve to use SessionDiagnostic, part # 1 crate a somewhat on larger size, so plz allow some time to get it finished.

Rollup merge of rust-lang#103405 - chenyukang:yukang/fix-103381-and-i…

3efbf30

…f, r=compiler-errors Detect incorrect chaining of if and if let conditions and recover Fixes rust-lang#103381

Rollup merge of rust-lang#104494 - GuillaumeGomez:migrate-gui-test-to…

5a8bc0b

…-func, r=notriddle Migrate GUI test to use functions r? `@notriddle`

Rollup merge of rust-lang#104550 - RalfJung:typo, r=compiler-errors

7e5e520

fix a typo r? `@lcnr`

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 Nov 18, 2022

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 Nov 18, 2022

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 Nov 18, 2022

This was referenced Nov 18, 2022

Rollup of 9 pull requests #104585

Closed

Rollup of 8 pull requests #104589

Closed

bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 18, 2022

bors merged commit b833ad5 into rust-lang:master Nov 18, 2022

rustbot added this to the 1.67.0 milestone Nov 18, 2022

This was referenced Nov 18, 2022

Match and enforce crate and slug names #104120

Merged

errors: generate typed identifiers in each crate #103042

Merged

Migrate rustc_resolve to use SessionDiagnostic, part # 1 #101162

Merged

use CLOCK_BOOTTIME in Instant::now #88714

Closed

matthiaskrgr deleted the rollup-k36ybtp branch December 22, 2022 10:46

matthiaskrgr mentioned this pull request Aug 3, 2023

[ICE]: Broken MIR in drop glue with specialization #107228

Closed

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 8 pull requests #104573

Rollup of 8 pull requests #104573

matthiaskrgr commented Nov 18, 2022

matthiaskrgr commented Nov 18, 2022

bors commented Nov 18, 2022

bors commented Nov 18, 2022

bors commented Nov 18, 2022

matthiaskrgr commented Nov 18, 2022

rust-log-analyzer commented Nov 18, 2022

bors commented Nov 18, 2022

bors commented Nov 18, 2022

rust-timer commented Nov 18, 2022

rust-timer commented Nov 19, 2022

Rollup of 8 pull requests #104573

Rollup of 8 pull requests #104573

Conversation

matthiaskrgr commented Nov 18, 2022

matthiaskrgr commented Nov 18, 2022

bors commented Nov 18, 2022

bors commented Nov 18, 2022

bors commented Nov 18, 2022

matthiaskrgr commented Nov 18, 2022

rust-log-analyzer commented Nov 18, 2022

bors commented Nov 18, 2022

bors commented Nov 18, 2022

rust-timer commented Nov 18, 2022

rust-timer commented Nov 19, 2022

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles