Merge pull request #4356 from embassy-rs/update-rust5

Update Rust nightly, stable.

3 files changed, 48 insertions, 80 deletions

diff --git a/embassy-executor/build_common.rs b/embassy-executor/build_common.rs
index b15a8369f..4f24e6d37 100644
--- a/embassy-executor/build_common.rs
+++ b/embassy-executor/build_common.rs
@@ -92,35 +92,3 @@ pub fn set_target_cfgs(cfgs: &mut CfgSet) {
 
     cfgs.set("has_fpu", target.ends_with("-eabihf"));
 }
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
-pub struct CompilerDate {
-    year: u16,
-    month: u8,
-    day: u8,
-}
-
-impl CompilerDate {
-    fn parse(date: &str) -> Option<Self> {
-        let mut parts = date.split('-');
-        let year = parts.next()?.parse().ok()?;
-        let month = parts.next()?.parse().ok()?;
-        let day = parts.next()?.parse().ok()?;
-        Some(Self { year, month, day })
-    }
-}
-
-impl PartialEq<&str> for CompilerDate {
-    fn eq(&self, other: &&str) -> bool {
-        let Some(other) = Self::parse(other) else {
-            return false;
-        };
-        self.eq(&other)
-    }
-}
-
-impl PartialOrd<&str> for CompilerDate {
-    fn partial_cmp(&self, other: &&str) -> Option<std::cmp::Ordering> {
-        Self::parse(other).map(|other| self.cmp(&other))
-    }
-}
diff --git a/embassy-executor/tests/ui/bad_return_impl_future.stderr b/embassy-executor/tests/ui/bad_return_impl_future.stderr
index 2980fd18b..57f147714 100644
--- a/embassy-executor/tests/ui/bad_return_impl_future.stderr
+++ b/embassy-executor/tests/ui/bad_return_impl_future.stderr
@@ -77,6 +77,22 @@ error[E0277]: task futures must resolve to `()` or `!`
   |    ^^^^ the trait `TaskFn<_>` is not implemented for fn item `fn() -> impl Future<Output = u32> {__task_task}`
   |
   = note: use `async fn` or change the return type to `impl Future<Output = ()>`
+note: required by a bound in `__task_pool_get`
+ --> tests/ui/bad_return_impl_future.rs:4:1
+  |
+4 | #[embassy_executor::task]
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `__task_pool_get`
+  = note: this error originates in the attribute macro `embassy_executor::task` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0277]: task futures must resolve to `()` or `!`
+ --> tests/ui/bad_return_impl_future.rs:5:4
+  |
+4 | #[embassy_executor::task]
+  | ------------------------- required by a bound introduced by this call
+5 | fn task() -> impl Future<Output = u32> {
+  |    ^^^^ the trait `TaskFn<_>` is not implemented for fn item `fn() -> impl Future<Output = u32> {__task_task}`
+  |
+  = note: use `async fn` or change the return type to `impl Future<Output = ()>`
 note: required by a bound in `task_pool_new`
  --> src/lib.rs
   |
@@ -102,19 +118,3 @@ note: required by a bound in `task_pool_new`
   |         F: TaskFn<Args, Fut = Fut>,
   |            ^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `task_pool_new`
   = note: this error originates in the attribute macro `embassy_executor::task` (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error[E0277]: task futures must resolve to `()` or `!`
- --> tests/ui/bad_return_impl_future.rs:5:4
-  |
-4 | #[embassy_executor::task]
-  | ------------------------- required by a bound introduced by this call
-5 | fn task() -> impl Future<Output = u32> {
-  |    ^^^^ the trait `TaskFn<_>` is not implemented for fn item `fn() -> impl Future<Output = u32> {__task_task}`
-  |
-  = note: use `async fn` or change the return type to `impl Future<Output = ()>`
-note: required by a bound in `__task_pool_get`
- --> tests/ui/bad_return_impl_future.rs:4:1
-  |
-4 | #[embassy_executor::task]
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `__task_pool_get`
-  = note: this error originates in the attribute macro `embassy_executor::task` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/embassy-executor/tests/ui/return_impl_send.stderr b/embassy-executor/tests/ui/return_impl_send.stderr
index 7e3e468b8..cd693af2b 100644
--- a/embassy-executor/tests/ui/return_impl_send.stderr
+++ b/embassy-executor/tests/ui/return_impl_send.stderr
@@ -77,30 +77,28 @@ error[E0277]: task futures must resolve to `()` or `!`
   |    ^^^^ the trait `TaskFn<_>` is not implemented for fn item `fn() -> impl Send {__task_task}`
   |
   = note: use `async fn` or change the return type to `impl Future<Output = ()>`
-note: required by a bound in `task_pool_new`
- --> src/lib.rs
+note: required by a bound in `__task_pool_get`
+ --> tests/ui/return_impl_send.rs:3:1
   |
-  |     pub const fn task_pool_new<F, Args, Fut, const POOL_SIZE: usize>(_: F) -> TaskPool<Fut, POOL_SIZE>
-  |                  ------------- required by a bound in this function
-  |     where
-  |         F: TaskFn<Args, Fut = Fut>,
-  |                         ^^^^^^^^^ required by this bound in `task_pool_new`
+3 | #[embassy_executor::task]
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `__task_pool_get`
+  = note: this error originates in the attribute macro `embassy_executor::task` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error[E0277]: task futures must resolve to `()` or `!`
+error[E0277]: `impl Send` is not a future
  --> tests/ui/return_impl_send.rs:3:1
   |
 3 | #[embassy_executor::task]
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `TaskFn<_>` is not implemented for fn item `fn() -> impl Send {__task_task}`
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^ `impl Send` is not a future
   |
-  = note: use `async fn` or change the return type to `impl Future<Output = ()>`
-note: required by a bound in `task_pool_new`
- --> src/lib.rs
+  = help: the trait `Future` is not implemented for `impl Send`
+note: required by a bound in `TaskPool::<F, N>::_spawn_async_fn`
+ --> src/raw/mod.rs
   |
-  |     pub const fn task_pool_new<F, Args, Fut, const POOL_SIZE: usize>(_: F) -> TaskPool<Fut, POOL_SIZE>
-  |                  ------------- required by a bound in this function
-  |     where
-  |         F: TaskFn<Args, Fut = Fut>,
-  |            ^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `task_pool_new`
+  | impl<F: Future + 'static, const N: usize> TaskPool<F, N> {
+  |         ^^^^^^ required by this bound in `TaskPool::<F, N>::_spawn_async_fn`
+...
+  |     pub unsafe fn _spawn_async_fn<FutFn>(&'static self, future: FutFn) -> SpawnToken<impl Sized>
+  |                   --------------- required by a bound in this associated function
   = note: this error originates in the attribute macro `embassy_executor::task` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: task futures must resolve to `()` or `!`
@@ -112,26 +110,28 @@ error[E0277]: task futures must resolve to `()` or `!`
   |    ^^^^ the trait `TaskFn<_>` is not implemented for fn item `fn() -> impl Send {__task_task}`
   |
   = note: use `async fn` or change the return type to `impl Future<Output = ()>`
-note: required by a bound in `__task_pool_get`
- --> tests/ui/return_impl_send.rs:3:1
+note: required by a bound in `task_pool_new`
+ --> src/lib.rs
   |
-3 | #[embassy_executor::task]
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `__task_pool_get`
-  = note: this error originates in the attribute macro `embassy_executor::task` (in Nightly builds, run with -Z macro-backtrace for more info)
+  |     pub const fn task_pool_new<F, Args, Fut, const POOL_SIZE: usize>(_: F) -> TaskPool<Fut, POOL_SIZE>
+  |                  ------------- required by a bound in this function
+  |     where
+  |         F: TaskFn<Args, Fut = Fut>,
+  |                         ^^^^^^^^^ required by this bound in `task_pool_new`
 
-error[E0277]: `impl Send` is not a future
+error[E0277]: task futures must resolve to `()` or `!`
  --> tests/ui/return_impl_send.rs:3:1
   |
 3 | #[embassy_executor::task]
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^ `impl Send` is not a future
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `TaskFn<_>` is not implemented for fn item `fn() -> impl Send {__task_task}`
   |
-  = help: the trait `Future` is not implemented for `impl Send`
-note: required by a bound in `TaskPool::<F, N>::_spawn_async_fn`
- --> src/raw/mod.rs
+  = note: use `async fn` or change the return type to `impl Future<Output = ()>`
+note: required by a bound in `task_pool_new`
+ --> src/lib.rs
   |
-  | impl<F: Future + 'static, const N: usize> TaskPool<F, N> {
-  |         ^^^^^^ required by this bound in `TaskPool::<F, N>::_spawn_async_fn`
-...
-  |     pub unsafe fn _spawn_async_fn<FutFn>(&'static self, future: FutFn) -> SpawnToken<impl Sized>
-  |                   --------------- required by a bound in this associated function
+  |     pub const fn task_pool_new<F, Args, Fut, const POOL_SIZE: usize>(_: F) -> TaskPool<Fut, POOL_SIZE>
+  |                  ------------- required by a bound in this function
+  |     where
+  |         F: TaskFn<Args, Fut = Fut>,
+  |            ^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `task_pool_new`
   = note: this error originates in the attribute macro `embassy_executor::task` (in Nightly builds, run with -Z macro-backtrace for more info)