Rollup of 5 pull requests by matthiaskrgr · Pull Request #125010 · rust-lang/rust

matthiaskrgr · 2024-05-11T11:16:42Z

Successful merges:

Stabilize byte_slice_trim_ascii for &[u8]/&str #124928 (Stabilize byte_slice_trim_ascii for &[u8]/&str)
Document proper usage of fmt::Error and fmt()'s Result. #124954 (Document proper usage of fmt::Error and fmt()'s Result.)
check if x test tests missing any test directory #124969 (check if x test tests missing any test directory)
Handle Deref expressions in invalid_reference_casting #124978 (Handle Deref expressions in invalid_reference_casting)
Miri subtree update #125005 (Miri subtree update)

r? @ghost
@rustbot modify labels: rollup

unix/fs: a bit of cleanup around host-specific code

the actual target-specific things we want to test are all in getrandom, and rand already tests miri itself

also add some comments for why we keep certain old obscure APIs supported

reduce test_dependencies Also add comments for why we need all these 3 random functions for Windows, and the old Linux syscall interface.

Solaris: make pre-main code work Fixesrust-lang/miri#3566

avoid code duplication between realloc and malloc

Implement wcslen

…dows

organize libc tests into a proper folder, and run some of them on Windows

README: update introduction For some time now, we have (to my knowledge) been able to detect all the UB that rustc actually exploits. I think it's time to advertise that. We also haven't had the problem of "not every nightly has Miri" for a while. `@rust-lang/miri` what do you think?

…an give better errors

io::Error handling: keep around the full io::Error for longer so we can give better errors This should help with the error message in rust-lang/miri#3587.

…RalfJung Implement non-null pointer for malloc(0) Use non-null pointer for malloc(0) as mentioned in rust-lang#3576 to detect leaks and double free of ``malloc(0)`` addresses.

Allow test targets to be set via CLI args Fixesrust-lang#3584 I'm not a pro shell script reader as I am a Windows user, but we shall see if the CI script broke.

make MIRI_TEST_TARGET and RUSTC_BLESS entirely an internal thing They are just used to communicate between `./miri test`/`./x.py test miri` and the test harness, but should not be used by users.

rename 'extern-so' to 'native-lib' Calling "extern" functions is not super clear IMO (extern to what), but saying that we are calling "native" functions from inside the interpreter makes it very clear I think.

Remove feature from documentation examples Add rustc_const_stable attribute to stabilized functions Update intra-doc link for `u8::is_ascii_whitespace` on `&[u8]` functions

Automatic Rustup

alloc: update comments around malloc() alignment Also separate the C heap shims form the Windows heap shims; their guarantees aren't quite the same.

Stabilize `byte_slice_trim_ascii` for `&[u8]`/`&str` Remove feature from documentation examples Update intra-doc link for `u8::is_ascii_whitespace` on `&[u8]` functions Closesrust-lang#94035 FCP has successfully completed rust-lang#94035 (comment)

Document proper usage of `fmt::Error` and `fmt()`'s `Result`. I've seen several newcomers wonder why `fmt::Error` doesn't have any error detail information, or propose to return it in response to an error condition found inside a `impl fmt::Display for MyType`. That is incorrect, per [a lone paragraph of the `fmt` module's documentation](https://doc.rust-lang.org/1.78.0/std/fmt/index.html#formatting-traits). However, users looking to implement a formatting trait won't necessarily look there. Therefore, let's add the critical information (that formatting per se is infallible) to all the involved items: every `fmt()` method, and `fmt::Error`. This PR is not intended to make any novel claims about `fmt`; only to repeat an existing one in places where it will be more visible.

…k-Simulacrum check if `x test tests` missing any test directory Add a unit test to ensure we don't skip any test directories for `x test tests` in the future.

…au,Nilstrieb Handle Deref expressions in invalid_reference_casting Similar to rust-lang#124908 See rust-lang#124951 for context; this PR fixes the last of the known false postiive cases with this lint that we encounter in Crater.

Miri subtree update r? `@ghost`

matthiaskrgr · 2024-05-11T11:16:59Z

@bors r+ rollup=never p=5

bors · 2024-05-11T11:17:01Z

📌 Commit 8f03405 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2024-05-11T12:46:58Z

⌛ Testing commit 8f03405 with merge 686bfc4...

bors · 2024-05-11T14:52:00Z

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

rust-timer · 2024-05-11T14:53:25Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#124928	Stabilize `byte_slice_trim_ascii` for `&[u8]`/`&str`	`2b512c4e1713646fe8abc83193a8ebc8a4f72bce` (link)
#124954	Document proper usage of `fmt::Error` and `fmt()`'s `Result…	`a658edebe6238d4799b56d1caefd911de8210266` (link)
#124969	check if `x test tests` missing any test directory	`823a653ce6f0982ea7a11f3515d40edc0462ed93` (link)
#124978	Handle Deref expressions in invalid_reference_casting	`fd756ac7e4b43756e513fd5422dd1f7c61582c72` (link)
#125005	Miri subtree update	`1cb8a1829efea6866bce1c08e64aeef070e7ff84` (link)

previous master: 35c5e67c69

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 · 2024-05-11T16:09:58Z

Finished benchmarking commit (686bfc4): 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)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-1.4%	[-1.7%, -1.2%]	3
Improvements ✅ (secondary)	-3.2%	[-3.5%, -2.9%]	2
All ❌✅ (primary)	-1.4%	[-1.7%, -1.2%]	3

Cycles

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

Binary size

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

Bootstrap: 674.634s -> 673.271s (-0.20%)
Artifact size: 315.86 MiB -> 315.86 MiB (-0.00%)

RalfJungand others added 30 commits May 5, 2024 18:49

unix/fs: a bit of cleanup around host-specific code
0ca3591

Auto merge ofrust-lang#3573- RalfJung:fs-cfg, r=RalfJung
a418b2d
unix/fs: a bit of cleanup around host-specific code

reduce tokio features
37087db

remove rand test
6a47bd4
the actual target-specific things we want to test are all in getrandom, and rand already tests miri itself

getrandom: test with and without isolation
a5baa15
also add some comments for why we keep certain old obscure APIs supported

Auto merge ofrust-lang#3574- RalfJung:deps, r=RalfJung
629d57e
reduce test_dependencies Also add comments for why we need all these 3 random functions for Windows, and the old Linux syscall interface.

solaris support start.
fb84198

Auto merge ofrust-lang#3570- devnexen:solaris_build_fix, r=RalfJung
e43458c
Solaris: make pre-main code work Fixesrust-lang/miri#3566

avoid code duplication between realloc and malloc
82e2144

Auto merge ofrust-lang#3578- RalfJung:realloc, r=RalfJung
e477895
avoid code duplication between realloc and malloc

Implement wcslen
43c9916

Auto merge ofrust-lang#3474- tyilo:wcslen, r=RalfJung
3d269e9
Implement wcslen

organize libc tests into a proper folder, and run some of them on Win…
dd5437f
…dows

Auto merge ofrust-lang#3579- RalfJung:libc, r=RalfJung
4d6d9a9
organize libc tests into a proper folder, and run some of them on Windows

README: update introduction
d2472ba

remove problems that I do not think we have seen in a while
34f64cd

io::Error handling: keep around the full io::Error for longer so we c…
1601b27
…an give better errors

Auto merge ofrust-lang#3589- RalfJung:io-error, r=RalfJung
15305a7
io::Error handling: keep around the full io::Error for longer so we can give better errors This should help with the error message in rust-lang/miri#3587.

Implement non-null pointer for malloc(0)
4ab79e5

Auto merge ofrust-lang#3580- tiif:feat/malloc0-non-null-pointer, r=…
2e1d417
…RalfJung Implement non-null pointer for malloc(0) Use non-null pointer for malloc(0) as mentioned in rust-lang#3576 to detect leaks and double free of ``malloc(0)`` addresses.

Allow test targets to be set via CLI args
6580a22

Update CI script for the miri-script test changes
6e564ed

Update documentation for miri-script test changes
620bf34

minor tweaks
d43cb71

Auto merge ofrust-lang#3588- RossSmyth:CliTarget, r=RalfJung
42d9b68
Allow test targets to be set via CLI args Fixesrust-lang#3584 I'm not a pro shell script reader as I am a Windows user, but we shall see if the CI script broke.

make MIRI_TEST_TARGET entirely an internal thing
e16f46c

make RUSTC_BLESS entirely an internal thing
cb44843

Auto merge ofrust-lang#3590- RalfJung:miri-test-target, r=RalfJung
3028864
make MIRI_TEST_TARGET and RUSTC_BLESS entirely an internal thing They are just used to communicate between `./miri test`/`./x.py test miri` and the test harness, but should not be used by users.

do not run symlink tests on Windows hosts
1edd3d5

borsand others added 13 commits May 10, 2024 16:33

Auto merge ofrust-lang#3593- RalfJung:native-lib, r=RalfJung
6f4c7d9
rename 'extern-so' to 'native-lib' Calling "extern" functions is not super clear IMO (extern to what), but saying that we are calling "native" functions from inside the interpreter makes it very clear I think.

Stabilize byte_slice_trim_ascii for &[u8]/&str
9fb49fa
Remove feature from documentation examples Add rustc_const_stable attribute to stabilized functions Update intra-doc link for `u8::is_ascii_whitespace` on `&[u8]` functions

Preparing for merge from rustc
4d63d0a

Merge from rustc
ce3daac

Auto merge ofrust-lang#3597- rust-lang:rustup-2024-05-11, r=RalfJung
2427bf9
Automatic Rustup

alloc: update comments around malloc() alignment
7a0ee91

separate windows heap functions from C heap shims
01b151e

Auto merge ofrust-lang#3598- RalfJung:heap, r=RalfJung
79a85d4
alloc: update comments around malloc() alignment Also separate the C heap shims form the Windows heap shims; their guarantees aren't quite the same.

Rollup merge ofrust-lang#124969- onur-ozkan:test-tests-remap, r=Mar…
7d7a182
…k-Simulacrum check if `x test tests` missing any test directory Add a unit test to ensure we don't skip any test directories for `x test tests` in the future.

Rollup merge ofrust-lang#125005- RalfJung:miri-sync, r=RalfJung
8f03405
Miri subtree update r? `@ghost`

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 May 11, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label May 11, 2024

bors merged commit 686bfc4 into rust-lang:masterMay 11, 2024

rustbot added this to the 1.80.0 milestone May 11, 2024

matthiaskrgr deleted the rollup-270pck3 branch September 1, 2024 17:35

Navigation Menu

Uh oh!

Uh oh!

Rollup of 5 pull requests - #125010

Rollup of 5 pull requests#125010
bors merged 50 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-270pck3

matthiaskrgr commented May 11, 2024

Uh oh!

matthiaskrgr commented May 11, 2024

Uh oh!

bors commented May 11, 2024

Uh oh!

bors commented May 11, 2024

Uh oh!

bors commented May 11, 2024

Uh oh!

rust-timer commented May 11, 2024

Uh oh!

rust-timer commented May 11, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

13 participants

Uh oh!

Uh oh!

Conversation

matthiaskrgr commented May 11, 2024

Uh oh!

matthiaskrgr commented May 11, 2024

Uh oh!

bors commented May 11, 2024

Uh oh!

bors commented May 11, 2024

Uh oh!

bors commented May 11, 2024

Uh oh!

rust-timer commented May 11, 2024

Uh oh!

rust-timer commented May 11, 2024

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

13 participants