Skip to content

Miri subtree update #121232

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
Merged
merged 56 commits into from
Feb 17, 2024
Merged

Miri subtree update #121232

merged 56 commits into from
Feb 17, 2024

Conversation

RalfJung
Copy link
Member

r? @ghost

devnexen and others added 30 commits January 29, 2024 20:49
@devnexen
moving out sched_getaffinity interception from linux'shim, FreeBSD su…
9eb94e8 
…pporting it too.
@oli-obk
Switch over to rustc's tracing crate instead of using our own log…
3d26a41 
… crate
@sunfishcode
Implement the mmap64 foreign item.
a6f1dba 
`mmap64` is like `mmap` but uses a 64-bit integer instead of `off_t` for
the offset parameter.
@devnexen
add num_cpus test
e47bb90
Preparing for merge from rustc
63524ee
Merge from rustc
38b8bd3
fmt
24fece2
@bors
Auto merge of rust-lang#3286 - rust-lang:rustup-2024-01-31, r=saethlin
562d529 
Automatic Rustup
@bors
Auto merge of rust-lang#3283 - devnexen:fbsd_affinity, r=oli-obk
fae29fd 
moving out sched_getaffinity interception from linux'shim, FreeBSD su…

…pporting it too.
@bors
Auto merge of rust-lang#2956 - oli-obk:atty, r=RalfJung
0602b13 
Switch over to rustc's `tracing` crate instead of using our own `log` crate

disadvantage: to turn on debug/trace logging, you need a rustc built with it
advantage: sharing our logging scheme with rustc, so our logs get nested correctly.
@tv42
Stop recommending cargo clean in README
5587a37 
Miri has used the `target/miri` subdirectory since 2021 to keep itself
separate from non-miri builds, so this should not be necessary.

See commit 6a18683

Since the items are no longer a sequence of steps to do in
order ("first, make sure that ..."), switch to an unordered list while
we're at it.

Closes rust-lang#3289
@bors
Auto merge of rust-lang#3290 - tv42:master, r=saethlin
f45a5b1 
Stop recommending cargo clean in README

Miri has used the `target/miri` subdirectory since 2021 to keep itself separate from non-miri builds, so this should not be necessary.

See commit 6a18683

Since the items are no longer a sequence of steps to do in order ("first, make sure that ..."), switch to an unordered list while we're at it.

Closes rust-lang#3289
Preparing for merge from rustc
eaa2da5
Merge from rustc
08e7741
@bors
Auto merge of rust-lang#3291 - rust-lang:rustup-2024-02-06, r=saethlin
35551d0 
Automatic Rustup
Preparing for merge from rustc
cab1cc4
Merge from rustc
c232e94
fmt
964a576
@bors
Auto merge of rust-lang#3292 - rust-lang:rustup-2024-02-08, r=saethlin
a5077d9 
Automatic Rustup
Preparing for merge from rustc
d4b8ed0
Merge from rustc
3e97b41
fmt
45d5d4b
@bors
Auto merge of rust-lang#3293 - rust-lang:rustup-2024-02-10, r=saethlin
5a3a2d5 
Automatic Rustup
@sunfishcode
Factor out the redundancy between test_mmap and test_mmap64.
aa40634
Preparing for merge from rustc
0913e22
Merge from rustc
31b6625
fmt
48bb2bf
@bors
Auto merge of rust-lang#3294 - rust-lang:rustup-2024-02-11, r=saethlin
a40a100 
Automatic Rustup
@sunfishcode
Make the mmap64 implementation Linux-specific.
438f43c 
`mmap64` is only defined on Linux, so move the implementation
to Linux-specific code.
@sunfishcode
Move mmap64's implementation under "File related shims".
064ad45
oli-obk and others added 15 commits February 13, 2024 08:31
@oli-obk
Prevent rustfmt from messing up experimental syntax
43e9411
@bors
Auto merge of rust-lang#3298 - rust-lang:rustup-2024-02-13, r=oli-obk
41555ab 
Automatic Rustup
@RalfJung
Preparing for merge from rustc
6539a64
@RalfJung
Merge from rustc
7a086ac
@RalfJung
remove no-longer needed rustfmt::skip
17693eb
@bors
Auto merge of rust-lang#3300 - RalfJung:rustup, r=RalfJung
6c117f6 
Rustup

With rust-lang#121035 landed we can rustfmt format `async FnOnce`.
Preparing for merge from rustc
089eb6b
Merge from rustc
f1abde7
fmt
840ca09
@bors
Auto merge of rust-lang#3301 - rust-lang:rustup-2024-02-16, r=saethlin
c335b4e 
Automatic Rustup
@eduardosm
Implement x86 AVX intrinsics
524c16d
@bors
Auto merge of rust-lang#3192 - eduardosm:x86-avx-intrinsics, r=RalfJung
d2a4ef3 
Implement x86 AVX intrinsics

~Blocked on <https://github.com/rust-lang/miri/pull/3214>~
Preparing for merge from rustc
63240d7
Merge from rustc
d523cab
@bors
Auto merge of rust-lang#3303 - rust-lang:rustup-2024-02-17, r=saethlin
bbfce91 
Automatic Rustup
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 17, 2024
@rustbot
Copy link
Collaborator

rustbot commented Feb 17, 2024

The Miri subtree was changed

cc @rust-lang/miri

@rustbot
Copy link
Collaborator

rustbot commented Feb 17, 2024

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

@RalfJung
Copy link
Member Author

@bors r+ p=1

@bors
Copy link
Collaborator

bors commented Feb 17, 2024

📌 Commit fd5a84b has been approved by RalfJung

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 17, 2024
@bors
Copy link
Collaborator

bors commented Feb 17, 2024

⌛ Testing commit fd5a84b with merge eeeb021...

@bors
Copy link
Collaborator

bors commented Feb 17, 2024

☀️ Test successful - checks-actions
Approved by: RalfJung
Pushing eeeb021 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 17, 2024
@bors bors merged commit eeeb021 into rust-lang:master Feb 17, 2024
@rustbot rustbot added this to the 1.78.0 milestone Feb 17, 2024
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (eeeb021): 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)		 - - 0
Improvements ✅
(secondary)		 -3.0% [-3.0%, -3.0%] 1
All ❌✅ (primary) - - 0

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: 638.94s -> 638.332s (-0.10%)
Artifact size: 306.36 MiB -> 306.33 MiB (-0.01%)

@RalfJung RalfJung deleted the miri branch February 18, 2024 08:34
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
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.78.0
Development

Successfully merging this pull request may close these issues.
9 participants
@RalfJung @rustbot @bors @rust-timer @devnexen @oli-obk @sunfishcode @tv42 @eduardosm