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.

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

Rollup of 8 pull requests #137571

Merged
merged 17 commits into from
Feb 25, 2025
Merged

Rollup of 8 pull requests #137571

merged 17 commits into from
Feb 25, 2025

Conversation

tgross35
Copy link
Contributor

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

GrigorenkoPV and others added 17 commits December 22, 2024 14:47
For the zkVM, even when a guest buffer is uninitialized, from the host's
perspective it is just a normal piece of memory which was initialized
before letting the guest write into it. This makes `sys_read` safe to
use with an uninitialized buffer. See
risc0/risc0#2853.
$ ./configure
configure: processing command line
configure:
configure: build.configure-args := []
configure: profile              := dist
configure:
configure: writing `config.toml` in current directory
configure:
configure: run `python /mnt/filling/store/nabijaczleweli/code/rust/x.py --help`

This is naturally not valid since I don't have a "python" executable
(and this will hopefully become more and more true as Python 2 dies out).

./configure knows this since it does try python3 "$@", then python2.7 &c.

After, this now says
  configure: run `python3 /mnt/filling/store/nabijaczleweli/code/rust/x.py --help`
which is possible, and corresponds to the interpreter actually running.
Co-authored-by: Amanieu d'Antras <[email protected]>
Explain how Vec::with_capacity is faithful

This is a revival of rust-lang#99790 building on the prose of `@workingjubilee` and edits of `@jmaargh.` Closes rust-lang#99385.
Stabilize `core::str::from_utf8_mut` as `const`

cc rust-lang#91006 (tracking issue)

r? libs-api
Update `String::from_raw_parts` safety requirements

These have become out of sync with `Vec::from_raw_part`'s safety requirements, and are likely to diverge again. I think it's safest to just point at `Vec`'s requirements.

rust-lang#119206 (comment)
…vm, r=Noratrieb

Implement `read_buf` for zkVM stdin

For the zkVM, even when a guest buffer is uninitialized, from the host's perspective it is just a normal piece of memory which was initialized before letting the guest write into it. This makes `sys_read` safe to use with an uninitialized buffer. See risc0/risc0#2853.

cc `@bobbobbio,` `@flaub`

r? `@Noratrieb`

Tracked in rust-lang#136756
configure.py: don't instruct user to run nonexistent program

```shell-session
$ ./configure
configure: processing command line
configure:
configure: build.configure-args := []
configure: profile              := dist
configure:
configure: writing `config.toml` in current directory
configure:
configure: run `python /mnt/filling/store/nabijaczleweli/code/rust/x.py --help`
```

This is naturally not valid since I don't have a "python" executable (and this will hopefully become more and more true as Python 2 dies out).

./configure knows this since it does `try python3 "$``@"`,`` then `python2.7` &c.

After, this now says
```
configure: run `python3 /mnt/filling/store/nabijaczleweli/code/rust/x.py --help`
```
which is possible, and corresponds to the interpreter actually running.
…nup, r=Amanieu

remove some unnecessary rustc_const_unstable

If the function is anyway unstable, it doesn't need to be `rustc_const_unstable`.

`copy_from_slice` turns out to not do anything const-unstable itself, we just haven't stably committed to it being available in const yet. See [here](https://rustc-dev-guide.rust-lang.org/stability.html?highlight=rustc_const_stable_indirect) for more details on the `rustc_const_stable_indirect` attribute.
@rustbot rustbot added 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-libs Relevant to the library team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Feb 24, 2025
@tgross35
Copy link
Contributor Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Feb 24, 2025

📌 Commit 91dc3ee has been approved by tgross35

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 Feb 24, 2025
@bors
Copy link
Contributor

bors commented Feb 25, 2025

⌛ Testing commit 91dc3ee with merge ad27045...

@bors
Copy link
Contributor

bors commented Feb 25, 2025

☀️ Test successful - checks-actions
Approved by: tgross35
Pushing ad27045 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 25, 2025
@bors bors merged commit ad27045 into rust-lang:master Feb 25, 2025
7 checks passed
@rustbot rustbot added this to the 1.87.0 milestone Feb 25, 2025
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#134655 Stabilize hash_extract_if c87b435de78d2e193efea0abf1d568eaeeae4c14 (link)
#135933 Explain how Vec::with_capacity is faithful aea7602c8be6fac111fe9969c768ad86c2fefb43 (link)
#136668 Stabilize core::str::from_utf8_mut as const 033342208cfe6e38558c9362775a9a3730ed5176 (link)
#136775 Update String::from_raw_parts safety requirements fe33324397db0de4d06e2e336c838f2729a48e76 (link)
#137109 stabilize extract_if cbeb4a9db2b1ca8956fa39b6f52cad04fcdf1a48 (link)
#137349 Implement read_buf for zkVM stdin 5f7908ec07e2770f2ceda3f0f60f4d811d9614ff (link)
#137493 configure.py: don't instruct user to run nonexistent program 2330a4e90625c9b40b3265cecdfd7d8ade1933b5 (link)
#137516 remove some unnecessary rustc_const_unstable 8baf0ff8d11993e229d8118d2e3436042c83267d (link)

previous master: f5729cfed3

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 (ad27045): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.8% [-0.8%, -0.8%] 1
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (primary 0.5%, secondary 0.9%)

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.8% [0.4%, 3.0%] 97
Regressions ❌
(secondary)
0.9% [0.4%, 2.4%] 125
Improvements ✅
(primary)
-1.3% [-3.5%, -0.6%] 15
Improvements ✅
(secondary)
-0.9% [-1.7%, -0.6%] 4
All ❌✅ (primary) 0.5% [-3.5%, 3.0%] 112

Cycles

Results (primary -0.4%, secondary -0.1%)

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.7% [0.4%, 2.0%] 12
Regressions ❌
(secondary)
1.3% [0.4%, 5.9%] 35
Improvements ✅
(primary)
-0.7% [-2.9%, -0.4%] 39
Improvements ✅
(secondary)
-0.9% [-3.3%, -0.4%] 62
All ❌✅ (primary) -0.4% [-2.9%, 2.0%] 51

Binary size

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

Bootstrap: 772.351s -> 770.608s (-0.23%)
Artifact size: 361.91 MiB -> 361.97 MiB (0.02%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.