Rollup of 6 pull requests #104495

Manishearth · 2022-11-16T17:42:31Z

Successful merges:

Minimal implementation of implicit deref patterns for Strings #98914 (Minimal implementation of implicit deref patterns for Strings)
Migrate rustc_resolve to use SessionDiagnostic, part # 1 #101162 (Migrate rustc_resolve to use SessionDiagnostic, part # 1)
~~Constify remaining Layout methods #102207 (Constify remaining Layout methods)~~
remove HRTB from [T]::is_sorted_by{,_key} #102977 (remove HRTB from [T]::is_sorted_by{,_key})
Diagnostics icu4x based list formatting. #104047 (Diagnostics icu4x based list formatting.)
update Miri #104456 (update Miri)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Rustup

Implement condvars for Windows Adds 3 shims for Windows: `SleepConditionVariableSRW`, `WakeConditionVariable`, `WakeAllConditionVariable` to add support for condvars (which fixes rust-lang#2628). Salvaged from what was removed from rust-lang#2231

remove a stray stderr file

README: Add macos cache deletion command

bump rustc-build-sysroot

Bump ui test

Rustup

pthread: slight refactoring of how we access the sync object fields

Manishearth · 2022-11-16T17:43:41Z

@bors rollup=never

Manishearth · 2022-11-16T18:06:42Z

@bors r+

bors · 2022-11-16T18:06:44Z

📌 Commit 8e72bb6c1e08ef7a5053c193951485c034580971 has been approved by Manishearth

It is now in the queue for this repository.

klensy · 2022-11-16T18:36:42Z

Something broken here: rollup reverts some dependency versions, but i can't find which PR do this.
Ahh, this one 8e72bb6.

Manishearth · 2022-11-16T18:40:37Z

Yes, because the lockfile needed to be updated

remove HRTB from `[T]::is_sorted_by{,_key}` Changes the signature of `[T]::is_sorted_by{,_key}` to match `[T]::binary_search_by{,_key}` and make code like rust-lang#53485 (comment) compile. Tracking issue: rust-lang#53485 ~~Do we need an ACP for something like this?~~ Edit: Filed ACP here: rust-lang/libs-team#121

…, r=davidtwco Diagnostics `icu4x` based list formatting. This adds a new kind of `DiagnosticArg` and add the ability to convert it to a `FluentValue::Custom`. When emitting fluent output, it makes use of `ListFormatter` from `icu4x` project to convert it to localized version of list following the fluent locale, as a kind of eager translation. Tested locally with locales like `en`, `ja`, etc, and they work fine. <del>Though neither `zh-CN` nor `zh-Hans` works correctly, it seems they fallback to `und` locale somehow, emitting only comma-based list. I believe this is an internal issue of `icu4x` itself.</del>(Works fine after rust-lang#104047 (comment)) Would love to hear what others think. r? `@davidtwco` cc `@Manishearth`

update Miri Not a huge sync, but there was a conflict and [josh](https://github.com/josh-project/josh/) seems to prefer those to be merged back ASAP.

Manishearth · 2022-11-16T18:46:24Z

@bors r+

fixed the lockfile, idk where the intermediate one came from

bors · 2022-11-16T18:46:25Z

📌 Commit e31f007 has been approved by Manishearth

It is now in the queue for this repository.

klensy · 2022-11-16T18:51:29Z

And now rollup description totally lies about it content. Maybe it's easier to rebuild it from scratch, instead of manually fixing stuff? IMHO

bors · 2022-11-16T19:28:52Z

⌛ Testing commit e31f007 with merge a34eed603522e235b5fe4e11e300769443b60da2...

Manishearth · 2022-11-16T19:35:32Z

@klensy I'd already crossed out the relevant entry in the description?

I usually rebuild from scratch, but in this case I've closed the tree and I didn't want to reopen just so that this last rollup can be remade.

And the lockfile update was a necessary manual change; I'd have had to do it even if I remade the rollup. It's just that the first time I made that commit I had run cargo check instead of x.py build which generated an incorrect lockfile. So my manual commit at 8e72bb6 wasn't the cause of the failure: it was just an incomplete fix.

Mark-Simulacrum · 2022-11-16T19:37:07Z

Editing in-flight rollups is relatively painful for our infrastructure, which in some cases tries to parse out specific PRs from descriptions/commits, so it's best to avoid doing that.

Manishearth · 2022-11-16T19:52:34Z

Ah, good to know!

bors · 2022-11-16T19:52:39Z

💔 Test failed - checks-actions

Manishearth · 2022-11-16T19:53:02Z

Failure:

``` ---- [mir-opt] src/test/mir-opt/deref-patterns/string.rs stdout ---- 25 _7 = const false; // scope 0 at $DIR/string.rs:+3:9: +3:10 26 _6 = move _1; // scope 0 at $DIR/string.rs:+3:9: +3:10 27 _0 = const 4321_i32; // scope 1 at $DIR/string.rs:+3:14: +3:18 - drop(_6) -> [return: bb6, unwind: bb12]; // scope 0 at $DIR/string.rs:+3:17: +3:18 + drop(_6) -> bb6; // scope 0 at $DIR/string.rs:+3:17: +3:18 29 } 30 31 bb2: {

37 }
38
39 bb3: {

      _4 = <str as PartialEq>::eq(_3, const "a") -> [return: bb4, unwind: bb12]; // scope 0 at $DIR/string.rs:+2:14: +2:17

      _4 = <str as PartialEq>::eq(_3, const "a") -> bb4; // scope 0 at $DIR/string.rs:+2:14: +2:17

41 // mir::Constant
42 // + span: $DIR/string.rs:9:14: 9:17
43 // + literal: Const { ty: for<'a, 'b> fn(&'a str, &'b str) -> bool {::eq}, val: Value() }

52
53 bb5: {
54 _0 = const 1234_i32; // scope 0 at $DIR/string.rs:+2:22: +2:26

      goto -> bb10;                    // scope 0 at $DIR/string.rs:+2:22: +2:26

      goto -> bb9;                     // scope 0 at $DIR/string.rs:+2:22: +2:26

56 }
57
58 bb6: {

59 StorageDead(_6); // scope 0 at $DIR/string.rs:+3:17: +3:18

      goto -> bb10;                    // scope 0 at $DIR/string.rs:+3:17: +3:18

      goto -> bb9;                     // scope 0 at $DIR/string.rs:+3:17: +3:18

61 }
62
63 bb7: {

64 return; // scope 0 at $DIR/string.rs:+5:2: +5:2
65 }
66

```
  bb8 (cleanup): {
```

      resume;                          // scope 0 at $DIR/string.rs:+0:1: +5:2

```
  bb8: {
```

      drop(_1) -> bb7;                 // scope 0 at $DIR/string.rs:+5:1: +5:2

69 }
70
71 bb9: {

      drop(_1) -> [return: bb7, unwind: bb8]; // scope 0 at $DIR/string.rs:+5:1: +5:2

```
  }
```
```
  bb10: {
```

      switchInt(_7) -> [false: bb7, otherwise: bb9]; // scope 0 at $DIR/string.rs:+5:1: +5:2

```
  }
```
```
  bb11 (cleanup): {
```

      drop(_1) -> bb8;                 // scope 0 at $DIR/string.rs:+5:1: +5:2

```
  }
```
```
  bb12 (cleanup): {
```

      switchInt(_7) -> [false: bb8, otherwise: bb11]; // scope 0 at $DIR/string.rs:+5:1: +5:2

      switchInt(_7) -> [false: bb7, otherwise: bb8]; // scope 0 at $DIR/string.rs:+5:1: +5:2

85 }
86 }
87


</details>

rust-log-analyzer · 2022-11-17T01:03:56Z

The job test-various failed! Check out the build log: (web) (plain)

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

   Compiling icu_provider_macros v1.0.0
[RUSTC-TIMING] regex test:false 4.811
   Compiling chalk-derive v0.87.0
[RUSTC-TIMING] displaydoc test:false 0.935
[RUSTC-TIMING] icu_provider_macros test:false 0.748
[RUSTC-TIMING] zerovec_derive test:false 1.669
   Compiling chalk-ir v0.87.0
[RUSTC-TIMING] gimli test:false 5.783
[RUSTC-TIMING] gimli test:false 5.783
[RUSTC-TIMING] zerofrom_derive test:false 2.324
   Compiling zerofrom v0.1.1
[RUSTC-TIMING] yoke_derive test:false 2.304
   Compiling thiserror v1.0.33
[RUSTC-TIMING] thiserror test:false 0.056
   Compiling fluent-syntax v0.11.0
   Compiling fluent-syntax v0.11.0
[RUSTC-TIMING] zerofrom test:false 0.110
   Compiling tracing v0.1.35
   Compiling tracing v0.1.35
[RUSTC-TIMING] zerofrom test:false 0.115
   Compiling tracing-subscriber v0.3.3
   Compiling thorin-dwp v0.3.0
[RUSTC-TIMING] fluent_syntax test:false 0.297
[RUSTC-TIMING] tracing test:false 0.272
---
[RUSTC-TIMING] zerovec test:false 1.089
[RUSTC-TIMING] rls_data test:false 0.928
   Compiling unic-langid-impl v0.9.1
[RUSTC-TIMING] tinystr test:false 0.194
   Compiling icu_locid v1.0.0
[RUSTC-TIMING] serde_json test:false 1.443
[RUSTC-TIMING] zerovec test:false 1.338
[RUSTC-TIMING] unic_langid_impl test:false 0.220
   Compiling unic-langid-macros-impl v0.9.1
---
   Compiling icu_provider_adapters v1.0.0
   Compiling icu_list v1.0.0
[RUSTC-TIMING] fluent_langneg test:false 0.170
[RUSTC-TIMING] intl_memoizer test:false 0.193
[RUSTC-TIMING] icu_locid test:false 1.087
[RUSTC-TIMING] fluent_langneg test:false 0.256
[RUSTC-TIMING] icu_provider test:false 0.696
[RUSTC-TIMING] intl_memoizer test:false 0.293
   Compiling rustc_baked_icu_data v0.0.0 (/checkout/compiler/rustc_baked_icu_data)
[RUSTC-TIMING] intl_pluralrules test:false 0.517
[RUSTC-TIMING] intl_pluralrules test:false 0.517
[RUSTC-TIMING] icu_list test:false 0.471
[RUSTC-TIMING] rustc_baked_icu_data test:false 0.377
[RUSTC-TIMING] icu_provider_adapters test:false 0.659
[RUSTC-TIMING] fluent_bundle test:false 0.603
   Compiling rustc_macros v0.1.0 (/checkout/compiler/rustc_macros)
[RUSTC-TIMING] fluent_bundle test:false 1.232
[RUSTC-TIMING] rustc_macros test:false 2.117
---
   Compiling tracing-attributes v0.1.22
[RUSTC-TIMING] displaydoc test:false 1.189
   Compiling icu_provider_macros v1.0.0
   Compiling chalk-derive v0.87.0
[RUSTC-TIMING] icu_provider_macros test:false 0.863
[RUSTC-TIMING] zerovec_derive test:false 2.658
[RUSTC-TIMING] thiserror_impl test:false 2.500
   Compiling thiserror v1.0.33
[RUSTC-TIMING] thiserror test:false 0.062
---
[RUSTC-TIMING] gimli test:false 10.683
   Compiling tracing-subscriber v0.3.3
[RUSTC-TIMING] fluent_syntax test:false 0.546
   Compiling thorin-dwp v0.3.0
[RUSTC-TIMING] yoke_derive test:false 4.263
[RUSTC-TIMING] zerofrom_derive test:false 4.519
   Compiling zerofrom v0.1.1
[RUSTC-TIMING] fluent_syntax test:false 0.797
[RUSTC-TIMING] fluent_syntax test:false 0.797
[RUSTC-TIMING] zerofrom test:false 0.134
[RUSTC-TIMING] zerofrom test:false 0.142
   Compiling tracing-tree v0.2.0
[RUSTC-TIMING] thorin test:false 1.932
   Compiling rustc_log v0.0.0 (/checkout/compiler/rustc_log)
[RUSTC-TIMING] object test:false 12.503
---
[RUSTC-TIMING] rls_data test:false 1.515
   Compiling unic-langid-impl v0.9.1
[RUSTC-TIMING] tinystr test:false 0.236
[RUSTC-TIMING] tinystr test:false 0.383
   Compiling icu_locid v1.0.0
   Compiling unic-langid-macros-impl v0.9.1
[RUSTC-TIMING] zerovec test:false 2.329
[RUSTC-TIMING] serde_json test:false 2.636
[RUSTC-TIMING] unic_langid_macros_impl test:false 0.723
---
[RUSTC-TIMING] fluent_langneg test:false 0.436
   Compiling fluent-bundle v0.15.2
[RUSTC-TIMING] intl_memoizer test:false 0.538
[RUSTC-TIMING] intl_pluralrules test:false 0.828
   Compiling rustc_baked_icu_data v0.0.0 (/checkout/compiler/rustc_baked_icu_data)
[RUSTC-TIMING] icu_provider test:false 1.350
[RUSTC-TIMING] intl_pluralrules test:false 1.409
[RUSTC-TIMING] icu_list test:false 1.038
[RUSTC-TIMING] icu_locid test:false 2.479
[RUSTC-TIMING] rustc_baked_icu_data test:false 0.739
   Compiling rustc_macros v0.1.0 (/checkout/compiler/rustc_macros)
   Compiling rustc_macros v0.1.0 (/checkout/compiler/rustc_macros)
[RUSTC-TIMING] icu_provider_adapters test:false 1.609
[RUSTC-TIMING] rustc_macros test:false 3.131
   Compiling rustc_index v0.0.0 (/checkout/compiler/rustc_index)
   Compiling rustc_data_structures v0.0.0 (/checkout/compiler/rustc_data_structures)
[RUSTC-TIMING] rustc_index test:false 0.739
---

failures:
Some tests failed in compiletest suite=mir-opt mode=mir-opt host=x86_64-unknown-linux-gnu target=wasm32-unknown-unknown

---- [mir-opt] src/test/mir-opt/deref-patterns/string.rs stdout ----
25         _7 = const false;                // scope 0 at $DIR/string.rs:+3:9: +3:10
26         _6 = move _1;                    // scope 0 at $DIR/string.rs:+3:9: +3:10
27         _0 = const 4321_i32;             // scope 1 at $DIR/string.rs:+3:14: +3:18
-         drop(_6) -> [return: bb6, unwind: bb12]; // scope 0 at $DIR/string.rs:+3:17: +3:18
+         drop(_6) -> bb6;                 // scope 0 at $DIR/string.rs:+3:17: +3:18
30 
31     bb2: {

37     }
37     }
38 
39     bb3: {
-         _4 = <str as PartialEq>::eq(_3, const "a") -> [return: bb4, unwind: bb12]; // scope 0 at $DIR/string.rs:+2:14: +2:17
+         _4 = <str as PartialEq>::eq(_3, const "a") -> bb4; // scope 0 at $DIR/string.rs:+2:14: +2:17
41                                          // mir::Constant
42                                          // + span: $DIR/string.rs:9:14: 9:17
43                                          // + literal: Const { ty: for<'a, 'b> fn(&'a str, &'b str) -> bool {<str as PartialEq>::eq}, val: Value(<ZST>) }
52 
53     bb5: {
53     bb5: {
54         _0 = const 1234_i32;             // scope 0 at $DIR/string.rs:+2:22: +2:26
-         goto -> bb10;                    // scope 0 at $DIR/string.rs:+2:22: +2:26
+         goto -> bb9;                     // scope 0 at $DIR/string.rs:+2:22: +2:26
57 
58     bb6: {


59         StorageDead(_6);                 // scope 0 at $DIR/string.rs:+3:17: +3:18
-         goto -> bb10;                    // scope 0 at $DIR/string.rs:+3:17: +3:18
+         goto -> bb9;                     // scope 0 at $DIR/string.rs:+3:17: +3:18
62 
63     bb7: {


64         return;                          // scope 0 at $DIR/string.rs:+5:2: +5:2
66 
66 
-     bb8 (cleanup): {
-         resume;                          // scope 0 at $DIR/string.rs:+0:1: +5:2
+     bb8: {
+         drop(_1) -> bb7;                 // scope 0 at $DIR/string.rs:+5:1: +5:2
70 
71     bb9: {


-         drop(_1) -> [return: bb7, unwind: bb8]; // scope 0 at $DIR/string.rs:+5:1: +5:2
- 
-     bb10: {
-     bb10: {
-         switchInt(_7) -> [false: bb7, otherwise: bb9]; // scope 0 at $DIR/string.rs:+5:1: +5:2
- 
- 
-     bb11 (cleanup): {
-         drop(_1) -> bb8;                 // scope 0 at $DIR/string.rs:+5:1: +5:2
- 
- 
-     bb12 (cleanup): {
-         switchInt(_7) -> [false: bb8, otherwise: bb11]; // scope 0 at $DIR/string.rs:+5:1: +5:2
+         switchInt(_7) -> [false: bb7, otherwise: bb8]; // scope 0 at $DIR/string.rs:+5:1: +5:2
86 }
87 


thread '[mir-opt] src/test/mir-opt/deref-patterns/string.rs' panicked at 'Actual MIR output differs from expected MIR output /checkout/src/test/mir-opt/deref-patterns/string.foo.PreCodegen.after.mir', src/tools/compiletest/src/runtest.rs:3447:21


failures:
    [mir-opt] src/test/mir-opt/deref-patterns/string.rs

Lukas Markeffsky and others added 30 commits October 12, 2022 18:39

remove HRTB from [T]::is_sorted_by{,_key}

a02ec4c

add regression test

f3d7b39

Merge from rustc

aaa2392

Auto merge of rust-lang#2650 - RalfJung:rustup, r=RalfJung

42e450d

Rustup

remove a stray stderr file

46d0df4

Auto merge of rust-lang#2653 - RalfJung:stderr, r=RalfJung

724c1a0

remove a stray stderr file

README: Add macos cache deletion command

943f88b

Auto merge of rust-lang#2654 - mkroening:macos-cache, r=RalfJung

57d06f7

README: Add macos cache deletion command

bump rustc-build-sysroot

1f0a672

Auto merge of rust-lang#2655 - RalfJung:rustc-build-sysroot, r=RalfJung

9c574d8

bump rustc-build-sysroot

Add miri_alloc, miri_dealloc

2b39687

Bump ui test

de562ec

Auto merge of rust-lang#2659 - oli-obk:ui_test_bump, r=RalfJung

71c3ecf

Bump ui test

Merge from rustc

c02fa89

Auto merge of rust-lang#2662 - RalfJung:rustup, r=RalfJung

9356627

Rustup

Minimal implementation of implicit deref patterns

b9ccc46

Add feature gate

f6123c5

Move a ui test to make space for new folder

f06efcd

Adding more tests

1a75a9b

Add rustc_baked_icu_data crate.

422b935

Migrate diagnostics list output to use icu list formatter.

18a1de2

Import icu locale fallback data

1ebe279

Enable icu sync feature for parallel compiler

9f6c6bd

Include zh locale in icu data

4c24176

Rm diagnostic item, use lang item

332f79e

rename to string_deref_patterns

26be4ab

Fix compilation issue after rebase

ecaf5f7

pthread: slight refactoring of how we access the sync object fields

6adb2df

Auto merge of rust-lang#2663 - RalfJung:sync, r=RalfJung

2e6676d

pthread: slight refactoring of how we access the sync object fields

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 16, 2022

Manishearth force-pushed the rollup-uj7409j branch from ccf8a4b to 8e72bb6 Compare November 16, 2022 18:06

Manishearth mentioned this pull request Nov 16, 2022

Constify remaining Layout methods #102207

Merged

Manishearth force-pushed the rollup-uj7409j branch from 8e72bb6 to 2d17af2 Compare November 16, 2022 18:43

Manishearth added 4 commits November 16, 2022 10:45

Rollup merge of rust-lang#104456 - RalfJung:miri, r=RalfJung

82f40e0

update Miri Not a huge sync, but there was a conflict and [josh](https://github.com/josh-project/josh/) seems to prefer those to be merged back ASAP.

coalesce lockfile changes

e31f007

Manishearth force-pushed the rollup-uj7409j branch from 2d17af2 to e31f007 Compare November 16, 2022 18:46

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 16, 2022

Manishearth mentioned this pull request Nov 16, 2022

Minimal implementation of implicit deref patterns for Strings #98914

Merged

Manishearth closed this Nov 16, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 6 pull requests #104495

Rollup of 6 pull requests #104495

Manishearth commented Nov 16, 2022 •

edited

Loading

Manishearth commented Nov 16, 2022

Manishearth commented Nov 16, 2022

bors commented Nov 16, 2022

klensy commented Nov 16, 2022 •

edited

Loading

Manishearth commented Nov 16, 2022

Manishearth commented Nov 16, 2022

bors commented Nov 16, 2022

klensy commented Nov 16, 2022

bors commented Nov 16, 2022

Manishearth commented Nov 16, 2022

Mark-Simulacrum commented Nov 16, 2022

Manishearth commented Nov 16, 2022

bors commented Nov 16, 2022

Manishearth commented Nov 16, 2022 •

edited

Loading

rust-log-analyzer commented Nov 17, 2022

Rollup of 6 pull requests #104495

Rollup of 6 pull requests #104495

Conversation

Manishearth commented Nov 16, 2022 • edited Loading

Manishearth commented Nov 16, 2022

Manishearth commented Nov 16, 2022

bors commented Nov 16, 2022

klensy commented Nov 16, 2022 • edited Loading

Manishearth commented Nov 16, 2022

Manishearth commented Nov 16, 2022

bors commented Nov 16, 2022

klensy commented Nov 16, 2022

bors commented Nov 16, 2022

Manishearth commented Nov 16, 2022

Mark-Simulacrum commented Nov 16, 2022

Manishearth commented Nov 16, 2022

bors commented Nov 16, 2022

Manishearth commented Nov 16, 2022 • edited Loading

rust-log-analyzer commented Nov 17, 2022

Manishearth commented Nov 16, 2022 •

edited

Loading

klensy commented Nov 16, 2022 •

edited

Loading

Manishearth commented Nov 16, 2022 •

edited

Loading