Skip to content

Rollup of 5 pull requests - #114451

Merged
bors merged 16 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-37qmv19
Aug 4, 2023
Merged

Rollup of 5 pull requests#114451
bors merged 16 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-37qmv19

Conversation

@matthiaskrgr

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

oli-obkand others added 16 commits July 24, 2023 14:19
This is necessary for closure captures in 2021 edition, as they capture individual fields, not the full mentioned variables. So it may try to capture a field of an opaque (because the hidden type is known to be something with a field).
Rust requires a previous version of Rust to build, such as the current version, or the
previous version. However, the version comparison logic did not take patch releases
into consideration when doing the version comparison for the current branch, e.g.
Rust 1.71.1 could not be built by Rust 1.71.0 because it is neither an exact version
match, or the previous version.
Adjust the version comparison logic to tolerate mismatches in the patch version.
Signed-off-by: Ariadne Conill <ariadne@dereferenced.org>
…ction, r=cjgillot
Perform OpaqueCast field projection on HIR, too.
fixesrust-lang#105819
This is necessary for closure captures in 2021 edition, as they capture individual fields, not the full mentioned variables. So it may try to capture a field of an opaque (because the hidden type is known to be something with a field).
See rust-lang#99806 for when and why we added OpaqueCast to MIR.
…ty-aliases, r=oli-obk
Compute variances for lazy type aliases
Fixesrust-lang#114221.
CC ``@oli-obk``
r? types
…, r=lcnr
resolve before canonicalization in new solver, ICE if unresolved
Fold the values with a resolver before canonicalization instead of making it happen within canonicalization.
This allows us to filter trivial region constraints from the external constraints.
r? ``@lcnr``
…=Nilstrieb
Handle non-utf8 rpaths (fix FIXME)
Removes a FIXME for rust-lang#9639 which is closed since long ago.
Part of rust-lang#44366 which is E-help-wanted.
(Also see rust-lang#114377)
…are, r=ozkanonur
bootstrap: config: fix version comparison bug
Rust requires a previous version of Rust to build, such as the current version, or the previous version. However, the version comparison logic did not take patch releases into consideration when doing the version comparison for the current branch, e.g. Rust 1.71.1 could not be built by Rust 1.71.0 because it is neither an exact version match, or the previous version.
Adjust the version comparison logic to tolerate mismatches in the patch version.
@rustbotrustbot added A-rustdoc-json Area: Rustdoc JSON backend 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) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) rollup A PR which is a rollup labels Aug 4, 2023
@matthiaskrgr

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=5

@bors

bors commented Aug 4, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit 50f47d9 has been approved by matthiaskrgr

It is now in the queue for this repository.

@borsbors 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 Aug 4, 2023
@bors

bors commented Aug 4, 2023

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 50f47d9 with merge 34ccd04...

@bors

bors commented Aug 4, 2023

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Aug 4, 2023
@bors
bors merged commit 34ccd04 into rust-lang:masterAug 4, 2023
@rustbotrustbot added this to the 1.73.0 milestone Aug 4, 2023
@rust-timer

Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR#MessagePerf Build Sha
#114022Perform OpaqueCast field projection on HIR, too.72c336e0b28fcc811b43ed4173c0020f55caad08 (link)
#114253Compute variances for lazy type aliases530686423e80ae83b3e2bbc4c61da5579fa6eafe (link)
#114355resolve before canonicalization in new solver, ICE if unres…6ed79bedd0872a5316842ec465757896ce5a61b6 (link)
#114427Handle non-utf8 rpaths (fix FIXME)d1e4d722a44fefe2bcdcb2ccb5a3cb5f0bb83af8 (link)
#114440bootstrap: config: fix version comparison bugfec8f94fa52ddc38565b1443fdb8093122c8f41c (link)

previous master: 73dc6f03a2

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

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (34ccd04): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
0.2%[0.2%, 0.2%]1
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.

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

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
-3.9%[-4.7%, -3.1%]6
Improvements ✅
(secondary)
--0
All ❌✅ (primary)-3.9%[-4.7%, -3.1%]6

Binary size

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

Bootstrap: 647.034s -> 647.543s (0.08%)

@matthiaskrgr
matthiaskrgr deleted the rollup-37qmv19 branch March 16, 2024 18:18
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-rustdoc-jsonArea: Rustdoc JSON backendmerged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.WG-trait-system-refactorThe Rustc Trait System Refactor Initiative (-Znext-solver)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants

@matthiaskrgr@bors@rust-timer@rustbot@oli-obk@fmease@Enselic@compiler-errors@kaniini