diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e10518fa..aa633796 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: rust: ["stable"] include: - os: "ubuntu-latest" - rust: "1.82" # MSRV + rust: "1.83" # MSRV - os: "ubuntu-latest" rust: "nightly" steps: diff --git a/Cargo.toml b/Cargo.toml index ba6d12d8..f1d8cd5b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ resolver = "2" [workspace.package] version = "0.1.0" edition = "2021" -rust-version = "1.82" # MSRV +rust-version = "1.83" # MSRV authors = ["DaniPopes <57450786+DaniPopes@users.noreply.github.com>"] license = "MIT OR Apache-2.0" repository = "https://github.com/paradigmxyz/solar" diff --git a/clippy.toml b/clippy.toml index 7c844e9f..42cd954a 100644 --- a/clippy.toml +++ b/clippy.toml @@ -1,2 +1,2 @@ -msrv = "1.82" +msrv = "1.83" allow-dbg-in-tests = true diff --git a/crates/interface/src/source_map/file.rs b/crates/interface/src/source_map/file.rs index 4bf1e7c2..0ed79795 100644 --- a/crates/interface/src/source_map/file.rs +++ b/crates/interface/src/source_map/file.rs @@ -196,8 +196,7 @@ impl std::error::Error for OffsetOverflowError {} impl From for io::Error { fn from(e: OffsetOverflowError) -> Self { - // TODO(MSRV-1.83): Use `FileTooLarge`. - Self::new(io::ErrorKind::Other, e) + Self::new(io::ErrorKind::FileTooLarge, e) } } diff --git a/crates/sema/src/builtins/mod.rs b/crates/sema/src/builtins/mod.rs index 7e7168f2..42091a21 100644 --- a/crates/sema/src/builtins/mod.rs +++ b/crates/sema/src/builtins/mod.rs @@ -233,7 +233,7 @@ macro_rules! builtin_range_slice { let mut i = $first; let mut out = [Builtin::Blockhash; $last - $first]; while i < $last { - out[i - $first] = Builtin::from_index_unwrap(i); + out[i - $first] = Builtin::from_index(i).unwrap(); i += 1; } out @@ -276,15 +276,6 @@ impl Builtin { } } - // TODO(MSRV-1.83): Replace with .unwrap() - #[inline] - const fn from_index_unwrap(i: usize) -> Self { - match Self::from_index(i) { - Some(b) => b, - None => panic!(), - } - } - /// Returns the global builtins. pub fn global() -> &'static [Self] { builtin_range_slice!(Self::FIRST_GLOBAL, Self::LAST_GLOBAL)