Rollup of 10 pull requests #108053

matthiaskrgr · 2023-02-14T17:05:01Z

Successful merges:

Implement partial support for non-lifetime binders #107489 (Implement partial support for non-lifetime binders)
Update the minimum external LLVM to 14 #107573 (Update the minimum external LLVM to 14)
Fix x fix on the standard library itself #107626 (Fix x fix on the standard library itself)
update ICU4X to 1.1.0 #107673 (update ICU4X to 1.1.0)
Store metrics from metrics.json to CI PGO timer #107733 (Store metrics from metrics.json to CI PGO timer)
Use is_str instead of string kind comparison #108007 (Use is_str instead of string kind comparison)
add an unstable #[rustc_coinductive] attribute #108033 (add an unstable #[rustc_coinductive] attribute)
Refactor refcounted structural_impls via functors #108039 (Refactor refcounted structural_impls via functors)
Use derive attributes for uninteresting traversals #108040 (Use derive attributes for uninteresting traversals)
interpret: rename Pointer::from_addr → from_addr_invalid #108044 (interpret: rename Pointer::from_addr → from_addr_invalid)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Co-authored-by: Jakub Beránek <berykubik@gmail.com>

…rs, r=cjgillot Implement partial support for non-lifetime binders This implements support for non-lifetime binders. It's pretty useless currently, but I wanted to put this up so the implementation can be discussed. Specifically, this piggybacks off of the late-bound lifetime collection code in `rustc_hir_typeck::collect::lifetimes`. This seems like a necessary step given the fact we don't resolve late-bound regions until this point, and binders are sometimes merged. Q: I'm not sure if I should go along this route, or try to modify the earlier nameres code to compute the right bound var indices for type and const binders eagerly... If so, I'll need to rename all these queries to something more appropriate (I've done this for `resolve_lifetime::Region` -> `resolve_lifetime::ResolvedArg`) cc rust-lang/types-team#81 r? `@ghost`

Update the minimum external LLVM to 14 With this change, we'll have stable support for LLVM 14 through 16 (pending release). For reference, the previous increase to LLVM 13 was rust-lang#100460.

Fix `x fix` on the standard library itself Fixes rust-lang#107501

update ICU4X to 1.1.0 This patch updates the ICU4X crates to version 1.1.0 and regenerates the static data for `rustc_baked_icu_data`. This is mostly an internal and bugfix update. It notably includes unicode-org/icu4x#2834 to fix the future compatibility warning for [`BYTE_SLICE_IN_PACKED_STRUCT_WITH_DERIVE`](rust-lang#107457). [full changelog](https://github.com/unicode-org/icu4x/blob/icu%401.1.0/CHANGELOG.md)

…imulacrum Store metrics from `metrics.json` to CI PGO timer With this change, we'll be able to easily see how long does it take to compile LLVM vs `rustc`. r? ``@Mark-Simulacrum``

…ilstrieb Use `is_str` instead of string kind comparison Split out from rust-lang#107939

…errors add an unstable `#[rustc_coinductive]` attribute useful to test coinduction, especially in the new solver. as this attribute should remain permanently unstable I don't think this needs any official approval. cc `@rust-lang/types` had to weaken the check for stable query results in the solver to prevent an ICE if there's a coinductive cycle with constraints. r? `@compiler-errors`

…tors, r=oli-obk Refactor refcounted structural_impls via functors The mapping of values in refcounted types can be extracted as a functor, simplifying the implementations in the type library (whose structural folding impls now all use such functors). This functor could also prove more generally useful elsewhere.

…g_traversals, r=oli-obk Use derive attributes for uninteresting traversals It appears that visiting and folding was implemented on `BitMatrix` solely so that the derive macros could be used on `GeneratorLayout`, however such implementation would not necessarily be correct for other uses (if there were any). Adding attributes to the derive macro is more correct and potentially more generally useful. r? `@oli-obk`

interpret: rename Pointer::from_addr → from_addr_invalid This function corresponds to `ptr::invalid` in the standard library; the previous name was not clear enough IMO.

matthiaskrgr · 2023-02-14T17:05:14Z

@bors r+ rollup=never p=10

matthiaskrgr · 2023-02-14T17:06:19Z

@bors r+ rollup=never p=10

bors · 2023-02-14T17:06:28Z

📌 Commit ea31f83 has been approved by matthiaskrgr

It is now in the queue for this repository.

rust-log-analyzer · 2023-02-14T18:45:54Z

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

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

    Checking rustc_passes v0.0.0 (/checkout/compiler/rustc_passes)
    Checking rustc_save_analysis v0.0.0 (/checkout/compiler/rustc_save_analysis)
    Checking rustc_codegen_ssa v0.0.0 (/checkout/compiler/rustc_codegen_ssa)
    Checking rustc_resolve v0.0.0 (/checkout/compiler/rustc_resolve)
error[E0599]: no method named `sess` found for mutable reference `&'b mut Resolver<'a>` in the current scope
     |
     |
2509 |                     if self.r.sess().features_untracked().non_lifetime_binders {
     |                               ^^^^ method not found in `&'b mut Resolver<'a>`
For more information about this error, try `rustc --explain E0599`.
error: could not compile `rustc_resolve` due to previous error
warning: build failed, waiting for other jobs to finish...
error: could not compile `rustc_resolve` due to previous error

jyn514 and others added 29 commits February 3, 2023 05:33

Fix x fix on the standard library itself

9be0b3e

update ICU4X to 1.1.0

0d6fdef

Update the minimum external LLVM to 14

a06aaa4

Drop llvm14-builtins-abi with compiler_builtins 0.1.87

ffdbd58

Store metrics from metrics.json into PGO CI timer

d6bc681

Co-authored-by: Jakub Beránek <berykubik@gmail.com>

Log all metrics from metrics.json

afe9553

Use is_str instead of string kind comparison

3504c40

Add feature gate for non_lifetime_binders

4285990

Rename some region-specific stuff

43faa69

Make things actually work

74a1eb5

Be better about bound vars

e2c7562

A bit more work on late-bound consts

bd3e324

Deny some late-bound ty/ct in some positions, add tests

0162292

add a #[rustc_coinductive] attribute

646e667

add test for coinduction in new solver

51671cd

change the marker attribute to only_local

a2f0303

Refactor refcounted structural_impls via functors

26e3363

interpret: rename Pointer::from_addr → from_addr_invalid

91d2516

Use derive attributes for uninteresting traversals

3b510e8

Rollup merge of rust-lang#107573 - cuviper:drop-llvm-13, r=nagisa

6d78502

Update the minimum external LLVM to 14 With this change, we'll have stable support for LLVM 14 through 16 (pending release). For reference, the previous increase to LLVM 13 was rust-lang#100460.

Rollup merge of rust-lang#107626 - jyn514:x-fix, r=Mark-Simulacrum

42bd543

Fix `x fix` on the standard library itself Fixes rust-lang#107501

Rollup merge of rust-lang#107733 - Kobzol:opt-build-metrics, r=Mark-S…

557b6b1

…imulacrum Store metrics from `metrics.json` to CI PGO timer With this change, we'll be able to easily see how long does it take to compile LLVM vs `rustc`. r? ``@Mark-Simulacrum``

Rollup merge of rust-lang#108007 - compiler-errors:str-less-kind, r=N…

5188391

…ilstrieb Use `is_str` instead of string kind comparison Split out from rust-lang#107939

Rollup merge of rust-lang#108044 - RalfJung:from-addr-invalid, r=oli-obk

ea31f83

interpret: rename Pointer::from_addr → from_addr_invalid This function corresponds to `ptr::invalid` in the standard library; the previous name was not clear enough IMO.

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 Feb 14, 2023

matthiaskrgr closed this Feb 14, 2023

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 10 pull requests #108053

Rollup of 10 pull requests #108053

matthiaskrgr commented Feb 14, 2023

matthiaskrgr commented Feb 14, 2023

matthiaskrgr commented Feb 14, 2023

bors commented Feb 14, 2023

rust-log-analyzer commented Feb 14, 2023

Rollup of 10 pull requests #108053

Rollup of 10 pull requests #108053

Conversation

matthiaskrgr commented Feb 14, 2023

matthiaskrgr commented Feb 14, 2023

matthiaskrgr commented Feb 14, 2023

bors commented Feb 14, 2023

rust-log-analyzer commented Feb 14, 2023