[Pkg-rust-maintainers] Bug#1025101: Bug#1025101: rust-zstd-safe: Disabling std feature disables code

[Peter Green]

> I think this is because the WriteBuf implementation for Vec<_> in the 
> rust-zstd-safe Debian package is disabled by the `std` feature flag [2].
> 
> Is there a way you could get rust-zstd-safe to use the Debian libzstd without disabling this code that elan depends upon?

It seems there wasn't any good reason to disable the "std" feature in zstd-safe
(unlike some of the other features) so I re-enabled it and uploaded. I also
uploaded an update to the zstd package to bring it into line with zstd-sys and
zstd-safe and make it installable.

With those packages it seems elan can be built with zstd re-enabled and a simple
bump to the dependency. A debdiff for the elan changes I used to test is
attatched.
-------------- next part --------------
diff -Nru elan-1.4.2/debian/changelog elan-1.4.2/debian/changelog
--- elan-1.4.2/debian/changelog	2022-09-26 18:45:42.000000000 +0000
+++ elan-1.4.2/debian/changelog	2022-12-01 10:01:01.000000000 +0000
@@ -1,3 +1,10 @@
+elan (1.4.2-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Re-enable zstd and bump it to 0.11
+
+ -- Peter Michael Green <plugwash at debian.org>  Thu, 01 Dec 2022 10:01:01 +0000
+
 elan (1.4.2-1) unstable; urgency=medium
 
   * New upstream version (1.4.2)
diff -Nru elan-1.4.2/debian/control elan-1.4.2/debian/control
--- elan-1.4.2/debian/control	2022-09-26 18:11:26.000000000 +0000
+++ elan-1.4.2/debian/control	2022-12-01 10:01:01.000000000 +0000
@@ -42,6 +42,7 @@
  librust-backtrace-sys-dev,
  librust-markdown-dev,
  librust-zip+time-dev,
+ librust-zstd-0.11+default-dev,
  bash-completion
 Standards-Version: 4.6.1.0
 Homepage: https://github.com/leanprover/elan
diff -Nru elan-1.4.2/debian/patches/0003-dependencies.patch elan-1.4.2/debian/patches/0003-dependencies.patch
--- elan-1.4.2/debian/patches/0003-dependencies.patch	2022-09-26 18:44:47.000000000 +0000
+++ elan-1.4.2/debian/patches/0003-dependencies.patch	2022-12-01 10:01:01.000000000 +0000
@@ -48,7 +48,7 @@
 index fb58e02..727946b 100644
 --- a/src/elan-dist/Cargo.toml
 +++ b/src/elan-dist/Cargo.toml
-@@ -11,13 +11,12 @@ license = "MIT OR Apache-2.0"
+@@ -11,14 +11,13 @@ license = "MIT OR Apache-2.0"
  [dependencies]
  regex = "1.4.3"
  itertools = "0.10.0"
@@ -56,6 +56,8 @@
  url = "2.2.1"
  tar = "0.4.33"
  flate2 = "1.0.14"
+-zstd = "0.9"
++zstd = "0.11"
  walkdir = "2.3.1"
  toml = "0.5.8"
 -sha2 = "0.9.3"
@@ -63,7 +65,7 @@
  remove_dir_all = "0.7.0"
  elan-utils = { path = "../elan-utils" }
  error-chain = "0.12.4"
-@@ -25,10 +24,6 @@ json = "0.12.4"
+@@ -26,10 +25,6 @@ json = "0.12.4"
  zip = "0.5.13"
  filetime = "0.2.14"
  
diff -Nru elan-1.4.2/debian/patches/series elan-1.4.2/debian/patches/series
--- elan-1.4.2/debian/patches/series	2022-09-26 18:20:03.000000000 +0000
+++ elan-1.4.2/debian/patches/series	2022-12-01 10:01:01.000000000 +0000
@@ -1,3 +1,2 @@
 build.patch
-0002-Revert-feat-support-tar.zst-archives.patch
 0003-dependencies.patch