Implement core::error::Error on Rust 1.81+ (#747)

This commit updates when the `Error` trait is implemented to account for
how in Rust 1.81-and-prior the `Error` trait is always available, even
in `core`. This is currently done with detection at build-time of the
current Rust compiler version because the MSRV for this crate is below
1.81. In the future when the MSRV is increased, however, the build
script can be deleted.
This commit is contained in:
Alex Crichton
2024-12-03 21:42:44 -07:00
committed by GitHub
parent 01c8b19d14
commit 2b9db57a2e
5 changed files with 35 additions and 0 deletions
+2
View File
@@ -5,6 +5,8 @@ edition = "2018"
keywords = ["object", "elf", "mach-o", "pe", "coff"]
license = "Apache-2.0 OR MIT"
repository = "https://github.com/gimli-rs/object"
# NB: if this number increases to 1.81-or-later delete the `build.rs` script
# as it's no longer necessary.
rust-version = "1.65"
description = "A unified interface for reading and writing object file formats."
include = [
+27
View File
@@ -0,0 +1,27 @@
use std::process::Command;
use std::str;
fn main() {
// Temporary check to see if the rustc version >= 1.81 in which case the
// `Error` trait is always available. This is temporary because in the
// future the MSRV of this crate will be beyond 1.81 in which case this
// build script can be deleted.
let minor = rustc_minor_version().unwrap_or(0);
if minor >= 81 {
println!("cargo:rustc-cfg=core_error");
}
if minor >= 80 {
println!("cargo:rustc-check-cfg=cfg(core_error)");
}
}
fn rustc_minor_version() -> Option<u32> {
let rustc = std::env::var("RUSTC").unwrap();
let output = Command::new(rustc).arg("--version").output().ok()?;
let version = str::from_utf8(&output.stdout).ok()?;
let mut pieces = version.split('.');
if pieces.next() != Some("rustc 1") {
return None;
}
pieces.next()?.parse().ok()
}
+2
View File
@@ -24,6 +24,8 @@ impl fmt::Display for Error {
#[cfg(feature = "std")]
impl error::Error for Error {}
#[cfg(all(not(feature = "std"), core_error))]
impl core::error::Error for Error {}
impl From<read::Error> for Error {
fn from(error: read::Error) -> Error {
+2
View File
@@ -124,6 +124,8 @@ impl fmt::Display for Error {
#[cfg(feature = "std")]
impl std::error::Error for Error {}
#[cfg(all(not(feature = "std"), core_error))]
impl core::error::Error for Error {}
/// The result type used within the read module.
pub type Result<T> = result::Result<T, Error>;
+2
View File
@@ -60,6 +60,8 @@ impl fmt::Display for Error {
#[cfg(feature = "std")]
impl error::Error for Error {}
#[cfg(all(not(feature = "std"), core_error))]
impl core::error::Error for Error {}
/// The result type used within the write module.
pub type Result<T> = result::Result<T, Error>;