diff options
| author | Owen Jacobson <owen@grimoire.ca> | 2025-02-20 21:37:33 -0500 |
|---|---|---|
| committer | Owen Jacobson <owen@grimoire.ca> | 2025-02-20 22:35:25 -0500 |
| commit | 70525c018dfd31a27805bb1fb666501b73d43e21 (patch) | |
| tree | 348a78e6a1c5f1dcc0b788e4c177732f33609610 /src/test/fixtures/future.rs | |
| parent | d0cc34800243807dc1e4d352375566fde3b0f950 (diff) | |
Upgrade to Rust 1.85 and Rust 2024 edition.
There are a couple of migration suggestions from `cargo fix --edition` that I have deliberately skipped, which are intended to make sure that the changes to `if let` scoping don't bite us. They don't, I'm pretty sure, and if I turn out to be wrong, I'd rather fix the scoping issues (as they arise) than use `match` (`cargo fix --edition`'s suggestion).
This change also includes a bulk reformat and a clippy cleanup.
NOTA BENE: As this requires a new Rust toolchain, you'll need to update Rust (`rustup update`, normally) or the server won't build. This also applies to the Debian builder Docker image; it'll need to be rebuilt (from scratch, pulling its base image again) as well.
Diffstat (limited to 'src/test/fixtures/future.rs')
| -rw-r--r-- | src/test/fixtures/future.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/test/fixtures/future.rs b/src/test/fixtures/future.rs index 2f810a3..c0fa528 100644 --- a/src/test/fixtures/future.rs +++ b/src/test/fixtures/future.rs @@ -52,7 +52,7 @@ pub trait Expect: Sized { Self: Future<Output = Option<T>>; } -impl<'a, St> Expect for stream::Next<'a, St> { +impl<St> Expect for stream::Next<'_, St> { fn expect_ready(self, message: &str) -> Ready<Self> { Ready { future: self, @@ -131,7 +131,7 @@ pub struct Ready<'m, F> { message: &'m str, } -impl<'m, F> Future for Ready<'m, F> +impl<F> Future for Ready<'_, F> where F: Future + std::fmt::Debug, { @@ -155,7 +155,7 @@ pub struct Wait<'m, F> { message: &'m str, } -impl<'m, F> Future for Wait<'m, F> +impl<F> Future for Wait<'_, F> where F: Future + std::fmt::Debug, { @@ -179,7 +179,7 @@ pub struct Some<'m, F> { message: &'m str, } -impl<'m, F, T> Future for Some<'m, F> +impl<F, T> Future for Some<'_, F> where F: Future<Output = Option<T>> + std::fmt::Debug, { @@ -203,7 +203,7 @@ pub struct None<'m, F> { message: &'m str, } -impl<'m, F, T> Future for None<'m, F> +impl<F, T> Future for None<'_, F> where F: Future<Output = Option<T>> + std::fmt::Debug, { |
