Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: bump MSRV to 1.81 & use core::error::Error in place of std #780

Merged
merged 2 commits into from
Oct 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
rust: [
"stable",
"nightly",
"1.79", # MSRV
"1.81", # MSRV
]
flags: [
# No features
Expand All @@ -35,10 +35,10 @@ jobs:
include:
# MSRV features
- os: "ubuntu-latest"
rust: "1.79" # MSRV
rust: "1.81" # MSRV
flags: "--features json"
- os: "windows-latest"
rust: "1.79" # MSRV
rust: "1.81" # MSRV
flags: "--features json"
# All features
- os: "ubuntu-latest"
Expand All @@ -57,10 +57,10 @@ jobs:
cache-on-failure: true
# Only run tests on latest stable and above
- name: build
if: ${{ matrix.rust == '1.79' }} # MSRV
if: ${{ matrix.rust == '1.81' }} # MSRV
run: cargo build --workspace ${{ matrix.flags }}
- name: test
if: ${{ matrix.rust != '1.79' }} # MSRV
if: ${{ matrix.rust != '1.81' }} # MSRV
run: cargo test --workspace ${{ matrix.flags }}

miri:
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ resolver = "2"
[workspace.package]
version = "0.8.9"
edition = "2021"
rust-version = "1.79"
rust-version = "1.81"
authors = ["Alloy Contributors"]
license = "MIT OR Apache-2.0"
homepage = "https://github.com/alloy-rs/core"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ When updating this, also update:
- .github/workflows/ci.yml
-->

The current MSRV (minimum supported rust version) is 1.79.
The current MSRV (minimum supported rust version) is 1.81.

Alloy will keep a rolling MSRV policy of **at least** two versions behind the
latest stable release (so if the latest stable release is 1.58, we would
Expand Down
2 changes: 1 addition & 1 deletion clippy.toml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
msrv = "1.79"
msrv = "1.81"
3 changes: 1 addition & 2 deletions crates/dyn-abi/src/coerce.rs
Original file line number Diff line number Diff line change
Expand Up @@ -256,8 +256,7 @@ enum Error {
EmptyHexStringWithoutPrefix,
}

#[cfg(feature = "std")]
impl std::error::Error for Error {}
impl core::error::Error for Error {}

impl fmt::Display for Error {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
Expand Down
4 changes: 2 additions & 2 deletions crates/primitives/src/postgres.rs
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ pub enum ToSqlError {
Overflow(usize, Type),
}

impl std::error::Error for ToSqlError {}
impl core::error::Error for ToSqlError {}

/// Convert to Postgres types.
///
Expand Down Expand Up @@ -225,7 +225,7 @@ pub enum FromSqlError {
ParseError(Type),
}

impl std::error::Error for FromSqlError {}
impl core::error::Error for FromSqlError {}

impl<'a, const BITS: usize, const LIMBS: usize> FromSql<'a> for Signed<BITS, LIMBS> {
fn accepts(ty: &Type) -> bool {
Expand Down
3 changes: 1 addition & 2 deletions crates/primitives/src/signed/errors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@ impl fmt::Display for ParseSignedError {
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
pub struct BigIntConversionError;

#[cfg(feature = "std")]
impl std::error::Error for BigIntConversionError {}
impl core::error::Error for BigIntConversionError {}

impl fmt::Display for BigIntConversionError {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
Expand Down
3 changes: 1 addition & 2 deletions crates/sol-type-parser/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ pub type Result<T, E = Error> = core::result::Result<T, E>;
#[derive(Clone, PartialEq, Eq)]
pub struct Error(Repr);

#[cfg(feature = "std")]
impl std::error::Error for Error {}
impl core::error::Error for Error {}

impl fmt::Debug for Error {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
Expand Down
3 changes: 1 addition & 2 deletions crates/sol-type-parser/src/input.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ impl fmt::Display for CustomError {
}
}

#[cfg(feature = "std")]
impl std::error::Error for CustomError {}
impl core::error::Error for CustomError {}

pub type Input<'a> = winnow::Stateful<&'a str, RecursionCheck>;

Expand Down
6 changes: 2 additions & 4 deletions crates/sol-types/src/types/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,7 @@ impl fmt::Display for Revert {
}
}

#[cfg(feature = "std")]
impl std::error::Error for Revert {}
impl core::error::Error for Revert {}

impl AsRef<str> for Revert {
#[inline]
Expand Down Expand Up @@ -264,8 +263,7 @@ impl fmt::Display for Panic {
}
}

#[cfg(feature = "std")]
impl std::error::Error for Panic {}
impl core::error::Error for Panic {}

impl SolError for Panic {
type Parameters<'a> = (crate::sol_data::Uint<256>,);
Expand Down
8 changes: 2 additions & 6 deletions crates/sol-types/src/types/interface/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ use crate::{alloc::string::ToString, Error, Panic, Result, Revert, SolError};
use alloc::{string::String, vec::Vec};
use core::{convert::Infallible, fmt, iter::FusedIterator, marker::PhantomData};

#[cfg(feature = "std")]
use std::error::Error as StdError;

mod event;
pub use event::SolEventInterface;

Expand Down Expand Up @@ -211,10 +208,9 @@ impl<T: fmt::Display> fmt::Display for ContractError<T> {
}
}

#[cfg(feature = "std")]
impl<T: StdError + 'static> StdError for ContractError<T> {
impl<T: core::error::Error + 'static> core::error::Error for ContractError<T> {
#[inline]
fn source(&self) -> Option<&(dyn StdError + 'static)> {
fn source(&self) -> Option<&(dyn core::error::Error + 'static)> {
match self {
Self::CustomError(error) => Some(error),
Self::Panic(panic) => Some(panic),
Expand Down
2 changes: 1 addition & 1 deletion crates/syn-solidity/tests/contracts.rs
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ impl Drop for GitPatcher<'_> {
}
}

fn parse_file(path: &Path) -> Result<File, Box<dyn std::error::Error>> {
fn parse_file(path: &Path) -> Result<File, Box<dyn core::error::Error>> {
let solidity = fs::read_to_string(path)?;
syn::parse_str(&solidity).map_err(Into::into)
}
Expand Down