Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rollup of 10 pull requests #108587

Merged
merged 24 commits into from
Mar 1, 2023
Merged

Rollup of 10 pull requests #108587

merged 24 commits into from
Mar 1, 2023

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

csmoe and others added 24 commits February 25, 2023 16:18
@csmoe
record llvm cgu instruction stats
a30de6e
@nx2k3
fix rust-lang#108495, postfix decrement and prefix decrement has no w…
46ea12a 
…arning
@nx2k3
fix some comments
13a741a
@compiler-errors
Small cleanup to one_bound_for_assoc_type
ff336aa
@nx2k3
check double negation
0883973
@Noratrieb
Unify all validity check intrinsics
5f593da 
Also merges the inhabitedness check into the query to further unify the
code paths.
@nx2k3
handle only postfix decrement
a483026
@Noratrieb
Some infer/mod.rs cleanups
e326777
@albertlarsan68
Make mailmap more correct
b26371c
@clubby789
Fix x clean with specific paths
a321013
@WaffleLapkin
micro fmt changes
031206b
@Jesse-Bakker
Add contains_key to SortedIndexMultiMap
edf0530
@liushuyu
compiler/rustc_session: fix sysroot detection logic ...
2186358 
... on systems where /usr/lib contains a multi-arch structure
Update Fuchsia platform team members
8c6c8b1
@matthiaskrgr
Rollup merge of rust-lang#108376 - liushuyu:fix-sysroot-infer-103660,…
0dfbce1 
… r=ozkanonur

compiler/rustc_session: fix sysroot detection logic

This pull request fixes the sysroot detection logic on systems where `/usr/lib` contains a multi-arch structure (e.g. installs `rustc_driver` into `/usr/lib/x86_64-linux-gnu` folder).

This fixes a regression for various Linux systems introduced in rust-lang#103660. On Debian and Ubuntu systems, the logic in the pull request, as mentioned earlier, will resolve the sysroot to `/usr/lib`, making `rustc --print target-libdir` to return `/usr/lib/lib/rustlib/x86_64-unknown-linux-gnu/lib` (notice the extra `lib` at the beginning).

The fix is not very "clean" according to the standard. If you have any suggestions on improving the logic, you are more than welcome to comment below!
@matthiaskrgr
Rollup merge of rust-lang#108400 - csmoe:cgu-instr-perf, r=bjorn3
32d7024 
add llvm cgu instructions stats to perf

r? ```@bjorn3```
@matthiaskrgr
Rollup merge of rust-lang#108496 - nx2k3:issue-108495-dec, r=WaffleLa…
1c3cc8b 
…pkin

fix rust-lang#108495, postfix decrement and prefix decrement has no warning

Fixes rust-lang#108495
@matthiaskrgr
Rollup merge of rust-lang#108505 - Nilstrieb:further-unify-validity-i…
5af16c1 
…ntrinsics, r=michaelwoerister

Further unify validity intrinsics

Also merges the inhabitedness check into the query to further unify the
code paths.

Depends on rust-lang#108364
@matthiaskrgr
Rollup merge of rust-lang#108520 - compiler-errors:one-bound-nit, r=j…
35ef8ea 
…ackh726

Small cleanup to `one_bound_for_assoc_type`

Use fewer closures :)
@matthiaskrgr
Rollup merge of rust-lang#108560 - Nilstrieb:infer-cleanup, r=compile…
3ff3011 
…r-errors

Some `infer/mod.rs` cleanups
@matthiaskrgr
Rollup merge of rust-lang#108563 - albertlarsan68:patch-1, r=compiler…
ed5d00b 
…-errors

Make mailmap more correct
@matthiaskrgr
Rollup merge of rust-lang#108564 - clubby789:patch-1, r=jyn514
41eb28d 
Fix `x clean` with specific paths

Fixes rust-lang#108517

`cargo clean` takes package names to clean with `-p`, rather than as free args
@matthiaskrgr
Rollup merge of rust-lang#108571 - Jesse-Bakker:sorted_index_multi_ma…
1685894 
…p_contains_key, r=Nilstrieb

Add contains_key to SortedIndexMultiMap
@matthiaskrgr
Rollup merge of rust-lang#108578 - djkoloski:update_fuchsia_team, r=t…
cd5352d 
…mandry

Update Fuchsia platform team members

r? `@tmandry`
@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself 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. rollup A PR which is a rollup labels Mar 1, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=7

@bors
Copy link
Contributor

bors commented Mar 1, 2023

📌 Commit cd5352d has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors 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 Mar 1, 2023
@bors
Copy link
Contributor

bors commented Mar 1, 2023

⌛ Testing commit cd5352d with merge bcb610d...

@bors
Copy link
Contributor

bors commented Mar 1, 2023

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 1, 2023
@bors bors merged commit bcb610d into rust-lang:master Mar 1, 2023
@rustbot rustbot added this to the 1.69.0 milestone Mar 1, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha
#108578 8bc03289c970ca2254586e0ebe5745e1d3b95f9f
#108571 ed791cad5c3e6dfafc3eb10568df1727af76955c
#108564 f26383738e2b4d640d1c0da345cde50b81931bb8
#108563 bd1b780a1a33625436ed1f95c2c0a030bced59ad
#108560 9b64cb4a54ed395f89a3f7e5f9b162eabd02bbdf
#108520 f0a4abde1bdeca87b6e78ca99147c9f47dc9cc5d
#108505 b4a78d5d6ff0daf694da630c512666f11df54df9
#108496 38ece6f1287dc1a3ee0178711279e7b4d37d9b1d
#108400 588be360ed2a1d992eae770018c41fd034cf1f69
#108376 553153be12cf48c9b7e0b879fe02f28e440c9121

previous master: 5983a3a99e

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
Collaborator

Finished benchmarking commit (bcb610d): comparison URL.

Overall result: ❌✅ regressions and improvements - 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.7% [0.7%, 0.8%] 4
Regressions ❌
(secondary)		 0.4% [0.3%, 0.6%] 4
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -0.8% [-0.8%, -0.8%] 1
All ❌✅ (primary) 0.7% [0.7%, 0.8%] 4

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)		 1.4% [1.3%, 1.5%] 2
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -3.3% [-4.2%, -2.4%] 2
All ❌✅ (primary) 1.4% [1.3%, 1.5%] 2

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

@rustbot rustbot added the perf-regression Performance regression. label Mar 1, 2023
@matthiaskrgr matthiaskrgr deleted the rollup-rw6po59 branch March 16, 2024 18:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
A-meta Area: Issues & PRs about the rust-lang/rust repository itself merged-by-bors This PR was explicitly merged by bors. perf-regression Performance regression. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. 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.
Projects
None yet
Milestone
1.69.0
Development

Successfully merging this pull request may close these issues.

postfix decrement and prefix decrement has no warning