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

Prevent niche-optimization on futures to avoid triggering miri #6744

Merged
merged 5 commits into from
Aug 3, 2024
+148 −1
Merged

Prevent niche-optimization on futures to avoid triggering miri #6744

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f62ff0c
Add miri test for MaybeDone and Stage
Darksonn Aug 2, 2024
a96ef56
make clippy happy
Darksonn Aug 2, 2024
60352dd
Apply fix to MaybeDone
Darksonn Aug 2, 2024
d4edf63
Apply fix to Stage
Darksonn Aug 2, 2024
14e0390
Update test for size of join! future
Darksonn Aug 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Loading
Loading status checks…
Apply fix to Stage
@Darksonn
Darksonn committed Aug 2, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
commit d4edf63edf4b85a70c765e6eb3bb8b9574af65eb
2 changes: 1 addition & 1 deletion tokio/src/runtime/task/core.rs
View file
Original file line number Diff line number Diff line change
@@ -196,7 +196,7 @@ generate_addr_of_methods! {
}

/// Either the future or the output.
//#[repr(C)] // https://github.com/rust-lang/miri/issues/3780
#[repr(C)] // https://github.com/rust-lang/miri/issues/3780
pub(super) enum Stage<T: Future> {
Running(T),
Finished(super::Result<T::Output>),