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

Move --sysroot argument out of the argument file to fix miri issue #123030

Merged

Conversation

GuillaumeGomez
Copy link
Member

Fixes rust-lang/miri#3404.

For now, miri needs this argument to be moved out of the arg file so they can update it if needed.

cc @RalfJung

r? @notriddle

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Mar 25, 2024
@GuillaumeGomez GuillaumeGomez force-pushed the rustdoc-sysroot-out-of-arg-file branch from ac9b4e6 to 8c219af Compare March 25, 2024 11:06
@RalfJung
Copy link
Member

Thanks a lot! Yes I hope this will resolve the Miri issue.

@notriddle
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Mar 25, 2024

📌 Commit 8c219af has been approved by notriddle

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 25, 2024
@RalfJung
Copy link
Member

@bors p=1
(likely) unbreaks Miri

@bors
Copy link
Contributor

bors commented Mar 25, 2024

⌛ Testing commit 8c219af with merge cb7c636...

@bors
Copy link
Contributor

bors commented Mar 25, 2024

☀️ Test successful - checks-actions
Approved by: notriddle
Pushing cb7c636 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 25, 2024
@bors bors merged commit cb7c636 into rust-lang:master Mar 25, 2024
12 checks passed
@rustbot rustbot added this to the 1.79.0 milestone Mar 25, 2024
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (cb7c636): 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.0% [1.4%, 2.6%] 3
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 2.0% [1.4%, 2.6%] 3

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.7% [0.7%, 0.7%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.5% [-0.7%, -0.4%] 5
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -0.3% [-0.7%, 0.7%] 6

Binary size

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

Bootstrap: 672.431s -> 670.74s (-0.25%)
Artifact size: 315.03 MiB -> 315.07 MiB (0.01%)

@GuillaumeGomez GuillaumeGomez deleted the rustdoc-sysroot-out-of-arg-file branch March 25, 2024 20:44
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. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

cargo miri test is broken for doctests (Option 'sysroot' given more than once)
6 participants