Merge pull request #436 from dtolnay/up

Raise required compiler to Rust 1.68

Author: dtolnay

.github/workflows/ci.yml

@@ -57,7 +57,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rust: [1.67.0, 1.65.0, 1.52.0, 1.51.0]
+        rust: [1.68.0]
     timeout-minutes: 45
     steps:
       - uses: actions/checkout@v6

Cargo.toml

@@ -9,7 +9,7 @@ edition = "2018"
 keywords = ["error", "error-handling"]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/dtolnay/anyhow"
-rust-version = "1.51"
+rust-version = "1.68"
 
 [features]
 default = ["std"]

build.rs

@@ -1,3 +1,5 @@
+#![allow(clippy::uninlined_format_args)]
+
 use std::env;
 use std::ffi::OsString;
 use std::fs;
@@ -62,40 +64,20 @@ fn main() {
         }
     }
 
-    let rustc = match rustc_minor_version() {
-        Some(rustc) => rustc,
-        None => return,
+    let Some(rustc) = rustc_minor_version() else {
+        return;
     };
 
     if rustc >= 80 {
         println!("cargo:rustc-check-cfg=cfg(anyhow_build_probe)");
         println!("cargo:rustc-check-cfg=cfg(anyhow_nightly_testing)");
         println!("cargo:rustc-check-cfg=cfg(anyhow_no_clippy_format_args)");
         println!("cargo:rustc-check-cfg=cfg(anyhow_no_core_error)");
-        println!("cargo:rustc-check-cfg=cfg(anyhow_no_core_unwind_safe)");
-        println!("cargo:rustc-check-cfg=cfg(anyhow_no_fmt_arguments_as_str)");
-        println!("cargo:rustc-check-cfg=cfg(anyhow_no_unsafe_op_in_unsafe_fn_lint)");
         println!("cargo:rustc-check-cfg=cfg(error_generic_member_access)");
         println!("cargo:rustc-check-cfg=cfg(std_backtrace)");
     }
 
-    if rustc < 52 {
-        // core::fmt::Arguments::as_str
-        // https://blog.rust-lang.org/2021/05/06/Rust-1.52.0.html#stabilized-apis
-        println!("cargo:rustc-cfg=anyhow_no_fmt_arguments_as_str");
-
-        // #![deny(unsafe_op_in_unsafe_fn)]
-        // https://github.com/rust-lang/rust/issues/71668
-        println!("cargo:rustc-cfg=anyhow_no_unsafe_op_in_unsafe_fn_lint");
-    }
-
-    if rustc < 56 {
-        // core::panic::{UnwindSafe, RefUnwindSafe}
-        // https://blog.rust-lang.org/2021/10/21/Rust-1.56.0.html#stabilized-apis
-        println!("cargo:rustc-cfg=anyhow_no_core_unwind_safe");
-    }
-
-    if !error_generic_member_access && cfg!(feature = "std") && rustc >= 65 {
+    if !error_generic_member_access && cfg!(feature = "std") {
         // std::backtrace::Backtrace
         // https://blog.rust-lang.org/2022/11/03/Rust-1.65.0.html#stabilized-apis
         println!("cargo:rustc-cfg=std_backtrace");

src/error.rs

@@ -12,12 +12,9 @@ use core::fmt::{self, Debug, Display};
 use core::mem::ManuallyDrop;
 #[cfg(any(feature = "std", not(anyhow_no_core_error)))]
 use core::ops::{Deref, DerefMut};
-#[cfg(not(anyhow_no_core_unwind_safe))]
 use core::panic::{RefUnwindSafe, UnwindSafe};
 use core::ptr;
 use core::ptr::NonNull;
-#[cfg(all(feature = "std", anyhow_no_core_unwind_safe))]
-use std::panic::{RefUnwindSafe, UnwindSafe};
 
 impl Error {
     /// Create a new error object from any error type.
@@ -782,7 +779,7 @@ where
     // Attach E's native StdError vtable onto a pointer to self._object.
     let unerased_ref = e.cast::<ErrorImpl<E>>();
     Ref::from_raw(unsafe {
-        NonNull::new_unchecked(ptr::addr_of!((*unerased_ref.as_ptr())._object) as *mut E)
+        NonNull::new_unchecked(ptr::addr_of!((*unerased_ref.as_ptr())._object).cast_mut())
     })
 }
 
@@ -819,7 +816,7 @@ where
         let unerased_ref = e.cast::<ErrorImpl<E>>();
         Some(
             Ref::from_raw(unsafe {
-                NonNull::new_unchecked(ptr::addr_of!((*unerased_ref.as_ptr())._object) as *mut E)
+                NonNull::new_unchecked(ptr::addr_of!((*unerased_ref.as_ptr())._object).cast_mut())
             })
             .cast::<()>(),
         )
@@ -1085,8 +1082,5 @@ impl AsRef<dyn StdError> for Error {
     }
 }
 
-#[cfg(any(feature = "std", not(anyhow_no_core_unwind_safe)))]
 impl UnwindSafe for Error {}
-
-#[cfg(any(feature = "std", not(anyhow_no_core_unwind_safe)))]
 impl RefUnwindSafe for Error {}

src/lib.rs

@@ -209,12 +209,7 @@
 #![doc(html_root_url = "https://docs.rs/anyhow/1.0.100")]
 #![cfg_attr(error_generic_member_access, feature(error_generic_member_access))]
 #![no_std]
-#![deny(dead_code, unused_imports, unused_mut)]
-#![cfg_attr(
-    not(anyhow_no_unsafe_op_in_unsafe_fn_lint),
-    deny(unsafe_op_in_unsafe_fn)
-)]
-#![cfg_attr(anyhow_no_unsafe_op_in_unsafe_fn_lint, allow(unused_unsafe))]
+#![deny(dead_code, unsafe_op_in_unsafe_fn, unused_imports, unused_mut)]
 #![allow(
     clippy::doc_markdown,
     clippy::elidable_lifetime_names,
@@ -233,6 +228,7 @@
     clippy::redundant_else,
     clippy::return_self_not_must_use,
     clippy::struct_field_names,
+    clippy::uninlined_format_args,
     clippy::unused_self,
     clippy::used_underscore_binding,
     clippy::wildcard_imports,
@@ -685,12 +681,7 @@ pub mod __private {
     #[inline]
     #[cold]
     pub fn format_err(args: Arguments) -> Error {
-        #[cfg(anyhow_no_fmt_arguments_as_str)]
-        let fmt_arguments_as_str = None::<&str>;
-        #[cfg(not(anyhow_no_fmt_arguments_as_str))]
-        let fmt_arguments_as_str = args.as_str();
-
-        if let Some(message) = fmt_arguments_as_str {
+        if let Some(message) = args.as_str() {
             // anyhow!("literal"), can downcast to &'static str
             Error::msg(message)
         } else {

src/ptr.rs

@@ -113,7 +113,7 @@ where
     }
 
     pub fn as_ptr(self) -> *const T {
-        self.ptr.as_ptr() as *const T
+        self.ptr.as_ptr().cast_const()
     }
 
     pub unsafe fn deref(self) -> &'a T {

tests/test_ensure.rs

@@ -16,9 +16,11 @@
     clippy::needless_else,
     clippy::never_loop,
     clippy::overly_complex_bool_expr,
+    clippy::ptr_cast_constness,
     clippy::redundant_closure_call,
     clippy::redundant_pattern_matching,
     clippy::too_many_lines,
+    clippy::uninlined_format_args,
     clippy::unit_arg,
     clippy::unnecessary_cast,
     clippy::while_immutable_condition,

tests/test_ffi.rs

@@ -1,4 +1,5 @@
 #![deny(improper_ctypes, improper_ctypes_definitions)]
+#![allow(clippy::uninlined_format_args)]
 
 use anyhow::anyhow;
 

tests/test_macros.rs

@@ -6,6 +6,7 @@
     clippy::match_single_binding,
     clippy::needless_pass_by_value,
     clippy::shadow_unrelated,
+    clippy::uninlined_format_args,
     clippy::wildcard_imports
 )]