max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #882

Browse Source 
882: Remove separation of stable vs. nightly implementations in executor/raw r=Dirbaio a=jannic

Since rust 1.61, the required const features are availabe on stable rust

Co-authored-by: Jan Niehusmann <jan@gondor.com>
This commit is contained in:
bors[bot] 2022-07-29 16:26:45 +00:00 committed by GitHub
commit 8745d646f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
embassy/src/executor/raw/mod.rs
View File

@ -57,7 +57,6 @@ pub struct TaskHeader {
} }
impl TaskHeader { impl TaskHeader {
#[cfg(feature = "nightly")]
pub(crate) const fn new() -> Self { pub(crate) const fn new() -> Self {
Self { Self {
state: AtomicU32::new(0), state: AtomicU32::new(0),
@ -72,21 +71,6 @@ impl TaskHeader {
} }
} }
#[cfg(not(feature = "nightly"))]
pub(crate) fn new() -> Self {
Self {
state: AtomicU32::new(0),
run_queue_item: RunQueueItem::new(),
executor: Cell::new(ptr::null()),
poll_fn: UninitCell::uninit(),
#[cfg(feature = "time")]
expires_at: Cell::new(Instant::from_ticks(0)),
#[cfg(feature = "time")]
timer_queue_item: timer_queue::TimerQueueItem::new(),
}
}
pub(crate) unsafe fn enqueue(&self) { pub(crate) unsafe fn enqueue(&self) {
critical_section::with(|cs| { critical_section::with(|cs| {
let state = self.state.load(Ordering::Relaxed); let state = self.state.load(Ordering::Relaxed);
@ -128,11 +112,9 @@ pub struct TaskStorage<F: Future + 'static> {
} }
impl<F: Future + 'static> TaskStorage<F> { impl<F: Future + 'static> TaskStorage<F> {
#[cfg(feature = "nightly")]
const NEW: Self = Self::new(); const NEW: Self = Self::new();
/// Create a new TaskStorage, in not-spawned state. /// Create a new TaskStorage, in not-spawned state.
#[cfg(feature = "nightly")]
pub const fn new() -> Self { pub const fn new() -> Self {
Self { Self {
raw: TaskHeader::new(), raw: TaskHeader::new(),
@ -140,15 +122,6 @@ impl<F: Future + 'static> TaskStorage<F> {
} }
} }
/// Create a new TaskStorage, in not-spawned state.
#[cfg(not(feature = "nightly"))]
pub fn new() -> Self {
Self {
raw: TaskHeader::new(),
future: UninitCell::uninit(),
}
}
/// Try to spawn the task. /// Try to spawn the task.
/// ///
/// The `future` closure constructs the future. It's only called if spawning is /// The `future` closure constructs the future. It's only called if spawning is
@ -210,12 +183,10 @@ unsafe impl<F: Future + 'static> Sync for TaskStorage<F> {}
/// Raw storage that can hold up to N tasks of the same type. /// Raw storage that can hold up to N tasks of the same type.
/// ///
/// This is essentially a `[TaskStorage<F>; N]`. /// This is essentially a `[TaskStorage<F>; N]`.
#[cfg(feature = "nightly")]
pub struct TaskPool<F: Future + 'static, const N: usize> { pub struct TaskPool<F: Future + 'static, const N: usize> {
pool: [TaskStorage<F>; N], pool: [TaskStorage<F>; N],
} }
#[cfg(feature = "nightly")]
impl<F: Future + 'static, const N: usize> TaskPool<F, N> { impl<F: Future + 'static, const N: usize> TaskPool<F, N> {
/// Create a new TaskPool, with all tasks in non-spawned state. /// Create a new TaskPool, with all tasks in non-spawned state.
pub const fn new() -> Self { pub const fn new() -> Self {