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 7 pull requests #118023

Merged
merged 54 commits into from
Nov 18, 2023
Merged

Rollup of 7 pull requests #118023

merged 54 commits into from
Nov 18, 2023

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

workingjubilee and others added 30 commits October 28, 2023 23:10
@workingjubilee
Remove asmjs from library
6649219
@workingjubilee
Remove asmjs from tests
e9a009f
@workingjubilee
Remove asmjs from CI
c88fc2e
@workingjubilee
Remove asmjs from miri
e8a0274
@workingjubilee
Remove asmjs from tools
ca4d6d1
@workingjubilee
Remove asmjs from bootstrap
0c1a452
@workingjubilee
Remove asmjs from compiler
208f378
@workingjubilee
Officially remove asmjs platform support
dbb2500
@DaniPopes
library: use copied instead of manual map
e6779d9
@DaniPopes
compiler: use copied instead of manual map
2736430
@devnexen
freebsd adding getentropy interception support
b7a98e3
@bors
Auto merge of rust-lang#3161 - devnexen:freebsd_upd2, r=RalfJung
382475d 
freebsd adding getentropy interception support
@RalfJung
organize pass-dep tests more by the crate they test
6e907fa
@RalfJung
share getentropy shim across various unixes
edb4c0a
@bors
Auto merge of rust-lang#3162 - RalfJung:random, r=RalfJung
2832253 
share getentropy shim across various unixes
@RalfJung
don't expose all the borrow tracker stuff to the entire crate
9840525
@bors
Auto merge of rust-lang#3163 - RalfJung:borrow-privacy, r=RalfJung
177d8f2 
don't expose all the borrow tracker stuff to the entire crate
Preparing for merge from rustc
39e142f
Merge from rustc
34e8340
@bors
Auto merge of rust-lang#3165 - rust-lang:rustup-2023-11-15, r=RalfJung
31e62a9 
Automatic Rustup
@devnexen
freebsd adding getrandom interception.
c3fd57d 
note that os support was added in same time as getentropy.
@bors
Auto merge of rust-lang#3164 - devnexen:fbsd_upd3, r=RalfJung
012bd49 
freebsd adding getrandom interception.

note that os support was added in same time as getentropy.
@estebank
When using existing fn as module, don't claim it doesn't exist
890ce26 
Tweak wording of module not found in resolve, when the name exists but
belongs to a non-`mod` item.

Fix rust-lang#81232.
@RalfJung
Preparing for merge from rustc
9c8c2d1
@RalfJung
Merge from rustc
13bfe14
@bors
Auto merge of rust-lang#3167 - RalfJung:rustup, r=RalfJung
255d04c 
Rustup
@RalfJung
get rid of our last uses of set_var
ca67d7f
@bors
Auto merge of rust-lang#3168 - RalfJung:set_var, r=RalfJung
7df74eb 
get rid of our last uses of set_var

Fixes rust-lang/miri#2783
@devnexen
reallocarray shim linux/freebsd support proposal.
c6acc05
@bors
Auto merge of rust-lang#3166 - devnexen:reallocarray, r=RalfJung
0b6b44f 
reallocarray shim linux/freebsd support proposal.
@matthiaskrgr
Rollup merge of rust-lang#118016 - celinval:main, r=compiler-errors
d1f1849 
Add stable mir members to triagebot config

I also added the two crates from the project to `[assign.owners]` so it automatically assign to a project member changes to those crates.
@matthiaskrgr
Rollup merge of rust-lang#118022 - saethlin:miri, r=saethlin
8acb27c 
Miri subtree update
@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-testsuite Area: The testsuite used to check the correctness of rustc O-linux Operating system: Linux O-unix Operating system: Unix-like 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-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-libs Relevant to the library 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. rollup A PR which is a rollup labels Nov 17, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=7

@bors
Copy link
Contributor

bors commented Nov 17, 2023

📌 Commit 8acb27c 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 Nov 17, 2023
@bors
Copy link
Contributor

bors commented Nov 17, 2023

⌛ Testing commit 8acb27c with merge 82b804c...

@bors
Copy link
Contributor

bors commented Nov 18, 2023

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 18, 2023
@bors bors merged commit 82b804c into rust-lang:master Nov 18, 2023
12 checks passed
@rustbot rustbot added this to the 1.76.0 milestone Nov 18, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#117338 Remove asmjs beca78de1da0201577ff8afd304cd1f2fe09ec76 (link)
#117549 Use copied instead of manual map 78f1c096461ff9562fec9630d015bde66a4e4a3d (link)
#117745 Emit smir d034a207edb12d1cd1bbf0741f45ce17e70a7d3a (link)
#117964 When using existing fn as module, don't claim it doesn't ex… 35b762c86186ec6fc8066ef82cb0b4c5b30aae34 (link)
#118006 clarify fn discriminant guarantees: only free lifetimes m… bf71534a878adfb7d1cf451d7ffd1be06b62f683 (link)
#118016 Add stable mir members to triagebot config f307eea4acb044adfc42d18cdeea6dd2978dd7b3 (link)
#118022 Miri subtree update 5f1a21c13c31d5012b96ef536e832493d719a895 (link)

previous master: 2831701757

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

This was referenced Nov 18, 2023
Merged
Merged
Merged
Merged
Merged
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (82b804c): 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)		 2.5% [1.6%, 3.3%] 2
Regressions ❌
(secondary)		 2.6% [2.6%, 2.6%] 1
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -1.7% [-1.7%, -1.7%] 1
All ❌✅ (primary) 2.5% [1.6%, 3.3%] 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)		 8.6% [8.6%, 8.6%] 1
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 675.761s -> 677.526s (0.26%)
Artifact size: 313.69 MiB -> 313.79 MiB (0.03%)

@matthiaskrgr matthiaskrgr deleted the rollup-i9skwic 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 A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. O-linux Operating system: Linux O-unix Operating system: Unix-like 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. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-libs Relevant to the library 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.
Projects
None yet
Milestone
1.76.0
Development

Successfully merging this pull request may close these issues.