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

chore: prefer usize::MAX to std::usize::MAX #157

Merged
merged 2 commits into from
Oct 6, 2023
Merged

chore: prefer usize::MAX to std::usize::MAX #157

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1751f86
feat: ensure impl Send and Sync for Event
tisonkun Oct 4, 2023
8fea306
dedup
tisonkun Oct 6, 2023
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
6 changes: 4 additions & 2 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ use std::num::NonZeroUsize;
use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::Mutex;
use std::time::Duration;
use std::usize;

use cfg_if::cfg_if;

Expand Down Expand Up @@ -121,7 +120,7 @@ cfg_if! {
pub mod os;

/// Key associated with notifications.
const NOTIFY_KEY: usize = std::usize::MAX;
const NOTIFY_KEY: usize = usize::MAX;

/// Indicates that a file descriptor or socket can read or write without blocking.
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
Expand All @@ -136,6 +135,9 @@ pub struct Event {
extra: sys::EventExtra,
}

unsafe impl Send for Event {}
unsafe impl Sync for Event {}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't like the additional unsafe here. Can we just add a test to make sure the Event struct is Send and Sync?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add a test

Do you mean that we ensure the auto trait happens by testing? What's the difference to this patch that let the compiler do the "test"?

These two lines are automatically done if it meets the auto trait conditions. We declare them explicitly for testing here.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Like this: https://github.com/smol-rs/async-executor/blob/2cfb6e4ed03c7eaf6c5fb2d3170ac870ba0a9b9d/src/lib.rs#L1065

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK. I'm pushing a commit now - this seems a style preference :D

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We already have it in _assert_send_and_sync.

Then I'll convert this patch as a trivial code tidy one.


/// The mode in which the poller waits for I/O events.
#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
#[non_exhaustive]
Expand Down