diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7a482fc..e0d7a7d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: name: Rust ${{ matrix.rust }} strategy: matrix: - rust: [ "stable", "1.79", "nightly" ] + rust: [ "stable", "1.81", "nightly" ] include: - rust: nightly extra_args: "--features nightly --benches" diff --git a/CHANGELOG.md b/CHANGELOG.md index 11e8d19..81ba2e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ upgrades, e.g. `v0.6.x` -> `v0.7.x`. The config file format and [API](ref/api.md) currently have no stability guarantees, so they may change even on minor releases, e.g. `v0.7.5` -> `v0.7.6`. +## unreleased + +* bump minimum Rust version to 1.81. + ## v0.7.17 (2024-09-03) * bump minimum Rust version to 1.79. diff --git a/guide/build.md b/guide/build.md index d284f4c..c5b5d51 100644 --- a/guide/build.md +++ b/guide/build.md @@ -68,7 +68,7 @@ following command: $ brew install node ``` -Next, you need Rust 1.79+ and Cargo. The easiest way to install them is by +Next, you need Rust 1.81+ and Cargo. The easiest way to install them is by following the instructions at [rustup.rs](https://www.rustup.rs/). Avoid your Linux distribution's Rust packages, which tend to be too old. (At least on Debian-based systems; Arch and Gentoo might be okay.) diff --git a/server/Cargo.toml b/server/Cargo.toml index d5dbb34..4d69dd9 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Scott Lamb "] edition = "2021" resolver = "2" license-file = "../LICENSE.txt" -rust-version = "1.79" +rust-version = "1.81" publish = false [features] diff --git a/server/base/tracing_setup.rs b/server/base/tracing_setup.rs index 4e82b2d..dfae444 100644 --- a/server/base/tracing_setup.rs +++ b/server/base/tracing_setup.rs @@ -90,7 +90,7 @@ where /// This means it includes a timestamp, follows [OpenTelemetry Semantic /// Conventions for Exceptions](https://opentelemetry.io/docs/reference/specification/logs/semantic_conventions/exceptions/), /// etc. -fn panic_hook(p: &std::panic::PanicInfo) { +fn panic_hook(p: &std::panic::PanicHookInfo) { let payload: Option<&str> = if let Some(s) = p.payload().downcast_ref::<&str>() { Some(*s) } else if let Some(s) = p.payload().downcast_ref::() { diff --git a/server/db/Cargo.toml b/server/db/Cargo.toml index c971e05..4befd6a 100644 --- a/server/db/Cargo.toml +++ b/server/db/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Scott Lamb "] readme = "../README.md" edition = "2021" license-file = "../../LICENSE.txt" -rust-version = "1.79" +rust-version = "1.81" publish = false [features] diff --git a/server/src/mp4.rs b/server/src/mp4.rs index bd14d11..3398311 100644 --- a/server/src/mp4.rs +++ b/server/src/mp4.rs @@ -1881,7 +1881,7 @@ impl File { ), ) })?); - let mut b = std::pin::Pin::from(self.get_range(0..self.len())); + let mut b = self.get_range(0..self.len()); loop { use futures::stream::StreamExt; match b.next().await {