From 6e9ef01b81ec33dde60c17ae8116abfdee95240a Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 20 Apr 2023 21:08:10 +0200 Subject: [PATCH] Skip some doctests that fail to compile with thiserror 1.0.40 --- README.md | 3 --- eyre-fix-metadata.diff | 2 +- rust-eyre.spec | 19 +++++++++---------- 3 files changed, 10 insertions(+), 14 deletions(-) delete mode 100644 README.md diff --git a/README.md b/README.md deleted file mode 100644 index c7f68b9..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# rust-eyre - -The rust-eyre package diff --git a/eyre-fix-metadata.diff b/eyre-fix-metadata.diff index 07dc7a4..1cb96c8 100644 --- a/eyre-fix-metadata.diff +++ b/eyre-fix-metadata.diff @@ -1,5 +1,5 @@ --- eyre-0.6.8/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ eyre-0.6.8/Cargo.toml 2022-07-15T12:02:08.664203+00:00 ++++ eyre-0.6.8/Cargo.toml 2023-04-20T19:05:23.324498+00:00 @@ -66,10 +66,6 @@ [dependencies.once_cell] version = "1.4.0" diff --git a/rust-eyre.spec b/rust-eyre.spec index 5d6ffc7..12bb232 100644 --- a/rust-eyre.spec +++ b/rust-eyre.spec @@ -1,23 +1,20 @@ -# Generated by rust2rpm 21 +# Generated by rust2rpm 24 %bcond_without check %global debug_package %{nil} %global crate eyre -Name: rust-%{crate} +Name: rust-eyre Version: 0.6.8 Release: %autorelease -Summary: Flexible concrete Error Reporting type built on std::error::Error +Summary: Flexible concrete Error Reporting type with customizable Reports -# Upstream license specification: MIT OR Apache-2.0 -License: MIT or ASL 2.0 +License: MIT OR Apache-2.0 URL: https://crates.io/crates/eyre Source: %{crates_source} -# Initial patched metadata +# Manually created patch for downstream crate metadata changes # * drop optional pyo3 dependencies (version does not match what is in Fedora) -Patch0: eyre-fix-metadata.diff - -ExclusiveArch: %{rust_arches} +Patch: eyre-fix-metadata.diff BuildRequires: rust-packaging >= 21 @@ -94,7 +91,9 @@ use the "track-caller" feature of the "%{crate}" crate. %if %{with check} %check -%cargo_test +# * some doctests fail to compile with thiserror 1.0.40: +# https://github.com/yaahc/eyre/issues/94 +%cargo_test -- -- --skip "src/macros.rs" %endif %changelog