Stop patching out the smallvec-1 feature

- The uv package needs it, beginning with version 0.5.19.

.gitignore

@@ -20,3 +20,7 @@
 /rkyv-0.7.41.crate
 /rkyv-0.7.42.crate
 /rkyv-0.7.43.crate
+/rkyv-0.7.44.crate
+/rkyv-0.7.45.crate
+/rkyv-0.8.8.crate
+/rkyv-0.8.9.crate

rkyv-fix-metadata.diff

@@ -1,11 +1,134 @@
---- rkyv-0.7.43/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ rkyv-0.7.43/Cargo.toml	2024-01-14T21:48:04.597386+00:00
-@@ -44,7 +44,7 @@
- default-features = false
+--- rkyv-0.8.9/Cargo.toml	1970-01-01T00:00:01+00:00
++++ rkyv-0.8.9/Cargo.toml	2025-01-16T18:58:26.233700+00:00
+@@ -77,10 +77,6 @@
+ name = "derive"
+ path = "tests/derive.rs"
+ 
+-[[test]]
+-name = "ui"
+-path = "tests/ui.rs"
+-
+ [[bench]]
+ name = "log"
+ path = "benches/log.rs"
+@@ -96,40 +92,16 @@
+ path = "benches/minecraft_savedata.rs"
+ harness = false
  
+-[dependencies.arrayvec-0_7]
+-version = "0.7"
+-optional = true
+-default-features = false
+-package = "arrayvec"
+-
  [dependencies.bytecheck]
--version = "=0.6.11"
-+version = "0.6.11"
+ version = "0.8"
+ features = ["simdutf8"]
+ optional = true
+ default-features = false
+ 
+-[dependencies.bytes-1]
+-version = "1"
+-optional = true
+-default-features = false
+-package = "bytes"
+-
+ [dependencies.hashbrown]
+ version = "0.15"
  optional = true
  default-features = false
+-
+-[dependencies.hashbrown-0_14]
+-version = "0.14"
+-optional = true
+-default-features = false
+-package = "hashbrown"
+-
+-[dependencies.indexmap-2]
+-version = "2"
+-optional = true
+-default-features = false
+-package = "indexmap"
+ 
+ [dependencies.munge]
+ version = "0.4"
+@@ -157,42 +129,6 @@
+ default-features = false
+ package = "smallvec"
+ 
+-[dependencies.smol_str-0_2]
+-version = "0.2"
+-optional = true
+-default-features = false
+-package = "smol_str"
+-
+-[dependencies.smol_str-0_3]
+-version = "0.3"
+-optional = true
+-default-features = false
+-package = "smol_str"
+-
+-[dependencies.thin-vec-0_2]
+-version = "0.2.12"
+-optional = true
+-default-features = false
+-package = "thin-vec"
+-
+-[dependencies.tinyvec-1]
+-version = "1"
+-optional = true
+-default-features = false
+-package = "tinyvec"
+-
+-[dependencies.triomphe-0_1]
+-version = "0.1"
+-optional = true
+-default-features = false
+-package = "triomphe"
+-
+-[dependencies.uuid-1]
+-version = "1"
+-optional = true
+-default-features = false
+-package = "uuid"
+-
+ [dev-dependencies.ahash]
+ version = "0.8"
  
+@@ -212,7 +148,6 @@
+ aligned = []
+ alloc = [
+     "dep:hashbrown",
+-    "tinyvec-1?/alloc",
+     "rancor/alloc",
+ ]
+ big_endian = []
+@@ -225,28 +160,12 @@
+     "std",
+     "bytecheck",
+ ]
+-hashbrown-0_15 = ["dep:hashbrown"]
+-indexmap-2 = [
+-    "dep:indexmap-2",
+-    "alloc",
+-]
+ little_endian = []
+ pointer_width_16 = []
+ pointer_width_32 = []
+ pointer_width_64 = []
+ std = [
+     "alloc",
+-    "bytes-1?/std",
+-    "indexmap-2?/std",
+     "ptr_meta/std",
+-    "uuid-1?/std",
+-]
+-triomphe-0_1 = [
+-    "dep:triomphe-0_1",
+-    "alloc",
+ ]
+ unaligned = []
+-uuid-1 = [
+-    "dep:uuid-1",
+-    "bytecheck?/uuid-1",
+-]

rust-rkyv.spec

@@ -1,11 +1,11 @@
-# Generated by rust2rpm 25
-%bcond_without check
+# Generated by rust2rpm 27
+%bcond check 1
 %global debug_package %{nil}
 
 %global crate rkyv
 
 Name:           rust-rkyv
-Version:        0.7.43
+Version:        0.8.9
 Release:        %autorelease
 Summary:        Zero-copy deserialization framework for Rust
 
@@ -13,10 +13,18 @@ License:        MIT
 URL:            https://crates.io/crates/rkyv
 Source:         %{crates_source}
 # Manually created patch for downstream crate metadata changes
-# * relax bytecheck dependency from =0.6.11 to ^0.6.11
+# * Where possible, patch out "support for common crates" features. Many of
+#   these have satisfiable dependencies and could be packaged if something
+#   specifically requires them. Upstream plans to remove these crate-integration
+#   features in 1.0:
+#   https://github.com/rkyv/rkyv/blob/89a1bc48229ca6ac5ee620964d778293270257d0/rkyv/Cargo.toml#L29-L32
+# * Patch out the ui test, which seems to require *all* integrations, even the
+#   patched-out ones
 Patch:          rkyv-fix-metadata.diff
 
 BuildRequires:  cargo-rpm-macros >= 24
+BuildRequires:  dos2unix
+BuildRequires:  tomcli
 
 %global _description %{expand:
 Zero-copy deserialization framework for Rust.}
@@ -35,7 +43,6 @@ use the "%{crate}" crate.
 %files          devel
 %license %{crate_instdir}/LICENSE
 %doc %{crate_instdir}/README.md
-%doc %{crate_instdir}/crates-io.md
 %{crate_instdir}/
 
 %package     -n %{name}+default-devel
@@ -50,76 +57,40 @@ use the "default" feature of the "%{crate}" crate.
 %files       -n %{name}+default-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+alloc-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+alloc-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "alloc" feature of the "%{crate}" crate.
-
-%files       -n %{name}+alloc-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package     -n %{name}+arbitrary_enum_discriminant-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+arbitrary_enum_discriminant-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "arbitrary_enum_discriminant" feature of the "%{crate}" crate.
-
-%files       -n %{name}+arbitrary_enum_discriminant-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package     -n %{name}+archive_be-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+archive_be-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "archive_be" feature of the "%{crate}" crate.
-
-%files       -n %{name}+archive_be-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package     -n %{name}+archive_le-devel
+%package     -n %{name}+aligned-devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description -n %{name}+archive_le-devel %{_description}
+%description -n %{name}+aligned-devel %{_description}
 
 This package contains library source intended for building other packages which
-use the "archive_le" feature of the "%{crate}" crate.
+use the "aligned" feature of the "%{crate}" crate.
 
-%files       -n %{name}+archive_le-devel
+%files       -n %{name}+aligned-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+arrayvec-devel
+%package     -n %{name}+alloc-devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description -n %{name}+arrayvec-devel %{_description}
+%description -n %{name}+alloc-devel %{_description}
 
 This package contains library source intended for building other packages which
-use the "arrayvec" feature of the "%{crate}" crate.
+use the "alloc" feature of the "%{crate}" crate.
 
-%files       -n %{name}+arrayvec-devel
+%files       -n %{name}+alloc-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+bitvec-devel
+%package     -n %{name}+big_endian-devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description -n %{name}+bitvec-devel %{_description}
+%description -n %{name}+big_endian-devel %{_description}
 
 This package contains library source intended for building other packages which
-use the "bitvec" feature of the "%{crate}" crate.
+use the "big_endian" feature of the "%{crate}" crate.
 
-%files       -n %{name}+bitvec-devel
+%files       -n %{name}+big_endian-devel
 %ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+bytecheck-devel
@@ -134,136 +105,64 @@ use the "bytecheck" feature of the "%{crate}" crate.
 %files       -n %{name}+bytecheck-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+bytes-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+bytes-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "bytes" feature of the "%{crate}" crate.
-
-%files       -n %{name}+bytes-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package     -n %{name}+copy-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+copy-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "copy" feature of the "%{crate}" crate.
-
-%files       -n %{name}+copy-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package     -n %{name}+copy_unsafe-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+copy_unsafe-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "copy_unsafe" feature of the "%{crate}" crate.
-
-%files       -n %{name}+copy_unsafe-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package     -n %{name}+hashbrown-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+hashbrown-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "hashbrown" feature of the "%{crate}" crate.
-
-%files       -n %{name}+hashbrown-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package     -n %{name}+indexmap-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+indexmap-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "indexmap" feature of the "%{crate}" crate.
-
-%files       -n %{name}+indexmap-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package     -n %{name}+rend-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+rend-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "rend" feature of the "%{crate}" crate.
-
-%files       -n %{name}+rend-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package     -n %{name}+size_16-devel
+%package     -n %{name}+little_endian-devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description -n %{name}+size_16-devel %{_description}
+%description -n %{name}+little_endian-devel %{_description}
 
 This package contains library source intended for building other packages which
-use the "size_16" feature of the "%{crate}" crate.
+use the "little_endian" feature of the "%{crate}" crate.
 
-%files       -n %{name}+size_16-devel
+%files       -n %{name}+little_endian-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+size_32-devel
+%package     -n %{name}+pointer_width_16-devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description -n %{name}+size_32-devel %{_description}
+%description -n %{name}+pointer_width_16-devel %{_description}
 
 This package contains library source intended for building other packages which
-use the "size_32" feature of the "%{crate}" crate.
+use the "pointer_width_16" feature of the "%{crate}" crate.
 
-%files       -n %{name}+size_32-devel
+%files       -n %{name}+pointer_width_16-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+size_64-devel
+%package     -n %{name}+pointer_width_32-devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description -n %{name}+size_64-devel %{_description}
+%description -n %{name}+pointer_width_32-devel %{_description}
 
 This package contains library source intended for building other packages which
-use the "size_64" feature of the "%{crate}" crate.
+use the "pointer_width_32" feature of the "%{crate}" crate.
 
-%files       -n %{name}+size_64-devel
+%files       -n %{name}+pointer_width_32-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+smallvec-devel
+%package     -n %{name}+pointer_width_64-devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description -n %{name}+smallvec-devel %{_description}
+%description -n %{name}+pointer_width_64-devel %{_description}
 
 This package contains library source intended for building other packages which
-use the "smallvec" feature of the "%{crate}" crate.
+use the "pointer_width_64" feature of the "%{crate}" crate.
 
-%files       -n %{name}+smallvec-devel
+%files       -n %{name}+pointer_width_64-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+smol_str-devel
+%package     -n %{name}+smallvec-1-devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description -n %{name}+smol_str-devel %{_description}
+%description -n %{name}+smallvec-1-devel %{_description}
 
 This package contains library source intended for building other packages which
-use the "smol_str" feature of the "%{crate}" crate.
+use the "smallvec-1" feature of the "%{crate}" crate.
 
-%files       -n %{name}+smol_str-devel
+%files       -n %{name}+smallvec-1-devel
 %ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+std-devel
@@ -278,56 +177,22 @@ use the "std" feature of the "%{crate}" crate.
 %files       -n %{name}+std-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+strict-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+strict-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "strict" feature of the "%{crate}" crate.
-
-%files       -n %{name}+strict-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package     -n %{name}+tinyvec-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+tinyvec-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "tinyvec" feature of the "%{crate}" crate.
-
-%files       -n %{name}+tinyvec-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package     -n %{name}+uuid-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+uuid-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "uuid" feature of the "%{crate}" crate.
-
-%files       -n %{name}+uuid-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package     -n %{name}+validation-devel
+%package     -n %{name}+unaligned-devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description -n %{name}+validation-devel %{_description}
+%description -n %{name}+unaligned-devel %{_description}
 
 This package contains library source intended for building other packages which
-use the "validation" feature of the "%{crate}" crate.
+use the "unaligned" feature of the "%{crate}" crate.
 
-%files       -n %{name}+validation-devel
+%files       -n %{name}+unaligned-devel
 %ghost %{crate_instdir}/Cargo.toml
 
 %prep
 %autosetup -n %{crate}-%{version} -p1
+# Do not depend on divan; it is needed only for benchmarks.
+tomcli set Cargo.toml del dev-dependencies.divan
 %cargo_prep
 
 %generate_buildrequires

rust2rpm.toml

@@ -0,0 +1,27 @@
+[package]
+cargo-toml-patch-comments = [
+    """\
+    Where possible, patch out \"support for common crates\" features. Many of \
+    these have satisfiable dependencies and could be packaged if something \
+    specifically requires them. Upstream plans to remove these \
+    crate-integration features in 1.0: \
+    https://github.com/rkyv/rkyv/blob/89a1bc48229ca6ac5ee620964d778293270257d0/rkyv/Cargo.toml#L29-L32\
+    """,
+    """\
+    Patch out the ui test, which seems to require *all* integrations, even the \
+    patched-out ones\
+    """,
+]
+
+[requires]
+build = [
+    "dos2unix",
+    "tomcli",
+]
+
+[scripts.prep]
+pre = [
+    "# Do not depend on divan; it is needed only for benchmarks.",
+    "tomcli set Cargo.toml del dev-dependencies.divan",
+]
+

sources

@@ -1 +1 @@
-SHA512 (rkyv-0.7.43.crate) = 1774f241a0ebfe62ad25608b6e48adfca37dc7046599f5ce6a279b82548992b9a4bb56b82f56bb3fa535b27bf0ca73fa13e7851fd4b5ef5fa861de8d7ed99506
+SHA512 (rkyv-0.8.9.crate) = cd639e58ab104b89e13800070c656e40d90b2162fa3ce0d349cec7fc61eed882a8b2a30adbf0e34bc89686d11ec5e8031d6430a4b476605012c4d001b793ae74