[bug#69620] [PATCH rust-team 0/2] Upgrading rust-rocket and rust-pear

[bug#69620] [PATCH rust-team 0/2] Upgrading rust-rocket and rust-pear

[Aaron Covrig via Guix-patches via]

Upgraded rust-rocket and added pear-0.2 along with their              
dependencies, and enabled building and testing them. This does                
require setting RUSTC_BOOTSTRAP=1 and modifying a few build.rs
files to enable building with #![feature] support required by                                  
pear-0.1. Additionally, this does add a few missing crates to a
few of the Cargo.toml files to allow for running some of the test
cases.

Aaron Covrig (2):
  gnu: rust-pear: Added version 0.2.8 with deps
  gnu: rust-rocket: Upgraded and enabled full build

 gnu/packages/crates-io.scm  | 107 +++++++++++++++++-----
 gnu/packages/crates-web.scm | 171 ++++++++++++++++++++++++------------
 2 files changed, 198 insertions(+), 80 deletions(-)


base-commit: d29e5a83e887cd2f4f459a12cbbfc40c77e55ce2
-- 
2.41.0

[bug#69620] [PATCH rust-team 1/2] gnu: rust-pear: Added version 0.2.8 with deps

[Aaron Covrig via Guix-patches via]

From: Aaron Covrig <aarcov@gmail.com>

    * gnu/packages/crates-io.scm (rust-inlinable-string-0.1) : Added inlinable-string version 0.1.15.
    * gnu/packages/crates-io.scm (rust-pear-0.2) : Added version 0.2.8.
    * gnu/packages/crates-io.scm (rust-pear-codengen-0.2) : Changed to full build with tests
    * gnu/packages/crates-io.scm (rust-pear-0.1) : Changed to full build
      with tests
    * gnu/packages/crates-io.scm (rust-pear-codegen-0.1) : Changed to full build
      with tests
---
 gnu/packages/crates-io.scm | 107 +++++++++++++++++++++++++++++--------
 1 file changed, 84 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1a08748392..8a81a75e30 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -30496,6 +30496,31 @@ (define-public rust-inline-c-macro-0.1
 writing and executing C code inside Rust.")
     (license license:bsd-3)))
 
+(define-public rust-inlinable-string-0.1
+  (package
+    (name "rust-inlinable-string")
+    (version "0.1.15")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "inlinable_string" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1ysjci8yfvxgf51z0ny2nnwhxrclhmb3vbngin8v4bznhr3ybyn8"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-serde" ,rust-serde-1))
+       #:cargo-development-inputs (("rust-serde-test" ,rust-serde-test-1))))
+    (home-page "https://github.com/fitzgen/inlinable_string")
+    (synopsis "Provides inline strings that avoid heap-allocation")
+    (description
+     "The @code{inlinable_string} crate provides the @code{InlinableString} type
+-- an owned, grow-able UTF-8 string that stores small strings inline and avoids
+heap-allocation -- and the @code{StringExt} trait which abstracts string
+operations over both @code{std::string::String} and @code{InlinableString} (or
+even your own custom string type)")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-inotify-0.10
   (package
     (name "rust-inotify")
@@ -46264,27 +46289,47 @@ (define-public rust-pdqselect-0.1
 pdqsort.")
     (license (list license:asl2.0 license:expat))))
 
-(define-public rust-pear-0.1
+(define-public rust-pear-0.2
   (package
     (name "rust-pear")
-    (version "0.1.5")
+    (version "0.2.8")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "pear" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "02lnp8c414z5ds0lskd4zxlalrjljzpkg8g6kizszij4h52sgprj"))))
+        (base32 "1j03s6m80iqldnm6jzh3k1fbyk0lxirx8bi4ivgq3k3sq7va1k2c"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-pear-codegen" ,rust-pear-codegen-0.1))))
+     `(#:cargo-inputs (("rust-inlinable-string" ,rust-inlinable-string-0.1)
+                       ("rust-pear-codegen" ,rust-pear-codegen-0.2)
+                       ("rust-yansi" ,rust-yansi-1))))
     (home-page "https://crates.io/crates/pear")
     (synopsis "Pear is a fruit")
     (description "This package provides a pear is a fruit.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-pear-0.1
+  (package
+    (inherit rust-pear-0.2)
+    (name "rust-pear")
+    (version "0.1.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "pear" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "02lnp8c414z5ds0lskd4zxlalrjljzpkg8g6kizszij4h52sgprj"))))
+    (arguments
+     `(#:cargo-inputs (("rust-pear-codegen" ,rust-pear-codegen-0.1))
+       #:phases (modify-phases %standard-phases
+                  ;; Enable using nightly/dev features
+                  (add-after 'unpack 'enable-unstable-features
+                    (lambda _
+                      (setenv "RUSTC_BOOTSTRAP" "1"))))))))
+
 (define-public rust-pear-codegen-0.2
   (package
     (name "rust-pear-codegen")
@@ -46295,19 +46340,25 @@ (define-public rust-pear-codegen-0.2
        (uri (crate-uri "pear_codegen" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0xrwnlncg7l64gfy82vf6kq55ww7p6krq6bc3pqwymxpiq76f8if"))))
+        (base32 "0xrwnlncg7l64gfy82vf6kq55ww7p6krq6bc3pqwymxpiq76f8if"))
+       (modules '((guix build utils)))
+       (snippet '(begin
+                   ;; Add missing development dependency (for tests)
+                   (substitute* "Cargo.toml"
+                     (("\\[dev-dependencies\\]" all)
+                      (string-append "[dev-dependencies.pear]" "\n"
+                                     "version = \"0.2.8\""))) #t))))
     (build-system cargo-build-system)
     (arguments
-     `(#:tests? #f  ; use of undeclared crate or module `pear`
-       #:cargo-inputs
-       (("rust-proc-macro2" ,rust-proc-macro2-1)
-        ("rust-proc-macro2-diagnostics" ,rust-proc-macro2-diagnostics-0.10)
-        ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-2))))
+     `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-proc-macro2-diagnostics" ,rust-proc-macro2-diagnostics-0.10)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2))
+       ;; Add missing dev crate
+       #:cargo-development-inputs (("rust-pear" ,rust-pear-0.2))))
     (home-page "https://crates.io/crates/pear_codegen")
     (synopsis "Codegen for pear")
-    (description
-     "This package provides a (codegen) pear is a fruit.")
+    (description "This package provides a (codegen) pear is a fruit.")
     (license (list license:expat license:asl2.0))))
 
 (define-public rust-pear-codegen-0.1
@@ -46321,15 +46372,25 @@ (define-public rust-pear-codegen-0.1
        (uri (crate-uri "pear_codegen" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "19lcpkfspizd4ywwvca6rxgc311m070k3ndvwa9vrbw1snjqna60"))))
+        (base32 "19lcpkfspizd4ywwvca6rxgc311m070k3ndvwa9vrbw1snjqna60"))
+       (modules '((guix build utils)))
+       (snippet '(begin
+                   (delete-file "build.rs")))))
+    (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-proc-macro2" ,rust-proc-macro2-0.4)
-        ("rust-quote" ,rust-quote-0.6)
-        ("rust-syn" ,rust-syn-0.15)
-        ("rust-version-check" ,rust-version-check-0.9)
-        ("rust-yansi" ,rust-yansi-0.5))))))
+     `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-0.4)
+                       ("rust-quote" ,rust-quote-0.6)
+                       ("rust-syn" ,rust-syn-0.15)
+                       ;; development inputs here to address build issues
+                       ("rust-version-check" ,rust-version-check-0.9)
+                       ("rust-yansi" ,rust-yansi-0.5))
+       #:cargo-development-inputs (("rust-version-check" ,rust-version-check-0.9)
+                                   ("rust-yansi" ,rust-yansi-0.5))
+       #:phases (modify-phases %standard-phases
+                  ;; Enable using nightly/dev features
+                  (add-after 'unpack 'enable-unstable-features
+                    (lambda _
+                      (setenv "RUSTC_BOOTSTRAP" "1"))))))))
 
 (define-public rust-peeking-take-while-0.1
   (package
-- 
2.41.0

[bug#69620] [PATCH rust-team 2/2] gnu: rust-rocket: Upgraded and enabled full build

[Aaron Covrig via Guix-patches via]

From: Aaron Covrig <aarcov@gmail.com>

    * gnu/packages/crates-web.scm (rust-hyper-sync-rustls-0.3) : Upgraded to version 0.3.0-rc17 (and maintained v0.3.0-rc4 as latest has breaking changes)
    * gnu/packages/crates-web.scm (rust-rocket) : Upgraded to v0.4.11 and changed to full build
    * gnu/packages/crates-web.scm (rust-rocket-codegen) : Upgraded to v0.4.11 and changed to build
    * gnu/packages/crates-web.scm (rust-rocket-http) : Upgraded to v0.4.11 and changed to build with tests
---
 gnu/packages/crates-web.scm | 171 ++++++++++++++++++++++++------------
 1 file changed, 114 insertions(+), 57 deletions(-)

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index 60c735efa7..58436084ed 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -42,6 +42,7 @@ (define-module (gnu packages crates-web)
   #:use-module (gnu packages crates-windows)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages gtk)
+  #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages webkit))
@@ -3178,33 +3179,53 @@ (define-public rust-hyper-rustls-0.21
 (define-public rust-hyper-sync-rustls-0.3
   (package
     (name "rust-hyper-sync-rustls")
-    (version "0.3.0-rc.4")
+    (version "0.3.0-rc.17")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "hyper-sync-rustls" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "16zirxhsk26kz5jxxxs37wxsm02id97h57kkqs512fj1j0x486kd"))))
+        (base32 "1az37mc4dgxgpqc745r495nm2dwx48amw2w6c8mnwj00xb219c2c"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-test-flags
-       '("--release" "--"
-         ;; not all files included
-         "--skip=client"
-         "--skip=server")
-       #:cargo-inputs
-       (("rust-hyper" ,rust-hyper-0.10)
-        ("rust-rustls" ,rust-rustls-0.14)
-        ("rust-webpki" ,rust-webpki-0.18)
-        ("rust-webpki-roots" ,rust-webpki-roots-0.15))
-       #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.5))))
+     `(#:cargo-test-flags '("--release" "--"
+                            ;; skip tests client/server tests
+                            "--skip=client" "--skip=server")
+       #:cargo-inputs (("rust-hyper" ,rust-hyper-0.10)
+                       ("rust-rustls" ,rust-rustls-0.17)
+                       ("rust-webpki" ,rust-webpki-0.21)
+                       ("rust-webpki-roots" ,rust-webpki-roots-0.19))
+       #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.7))))
+    (native-inputs (list perl))
     (home-page "https://github.com/SergioBenitez/hyper-sync-rustls")
     (synopsis "Glue code for Rustls and synchronous Hyper")
     (description
      "This package provides glue code for Rustls and synchronous Hyper.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-hyper-sync-rustls-0.3-rc4
+  (package
+    (inherit rust-hyper-sync-rustls-0.3)
+    (name "rust-hyper-sync-rustls")
+    (version "0.3.0-rc.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "hyper-sync-rustls" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "16zirxhsk26kz5jxxxs37wxsm02id97h57kkqs512fj1j0x486kd"))))
+    (arguments
+     `(#:cargo-test-flags '("--release" "--"
+                            ;; not all files included
+                            "--skip=client" "--skip=server")
+       #:cargo-inputs (("rust-hyper" ,rust-hyper-0.10)
+                       ("rust-rustls" ,rust-rustls-0.14)
+                       ("rust-webpki" ,rust-webpki-0.18)
+                       ("rust-webpki-roots" ,rust-webpki-roots-0.15))
+       #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.5))))))
+
 (define-public rust-hyper-timeout-0.4
   (package
     (name "rust-hyper-timeout")
@@ -3659,32 +3680,50 @@ (define-public rust-reqwest-0.10
 (define-public rust-rocket-0.4
   (package
     (name "rust-rocket")
-    (version "0.4.7")
+    (version "0.4.11")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "rocket" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "04ybnhjw92zaan92lsmx6mkhqc9cpsg3885svb3wzyj39pyzvsvz"))))
+        (base32 "0pimz9v0737dvz487j0kij7kasjyahaxd7ba2bcc3p6513fdkfc3"))
+       (modules '((guix build utils)))
+       (snippet '(begin
+                   ;; enable nightly/dev in build.rs for RUSTC_BOOTSTRAP build
+                   (substitute* "build.rs"
+                     (("if !channel.supports_features")
+                      "/* if !channel.supports_features")
+                     (("if !version.at_least")
+                      "*/ \nif !version.at_least"))
+                   ;; Add missing development dependency (for tests)
+                   (substitute* "Cargo.toml"
+                     (("\\[features\\]" all)
+                      (string-append "[dev-dependencies.lazy_static]" "\n"
+                                     "version = \"1\"" "\n" all))) #t))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-atty" ,rust-atty-0.2)
-        ("rust-base64" ,rust-base64-0.12)
-        ("rust-log" ,rust-log-0.4)
-        ("rust-memchr" ,rust-memchr-2)
-        ("rust-num-cpus" ,rust-num-cpus-1)
-        ("rust-pear" ,rust-pear-0.1)
-        ("rust-rocket-codegen" ,rust-rocket-codegen-0.4)
-        ("rust-rocket-http" ,rust-rocket-http-0.4)
-        ("rust-state" ,rust-state-0.4)
-        ("rust-time" ,rust-time-0.1)
-        ("rust-toml" ,rust-toml-0.4)
-        ("rust-version-check" ,rust-version-check-0.9)
-        ("rust-yansi" ,rust-yansi-0.5)
-        ("rust-yansi" ,rust-yansi-0.5))))
+     `(#:cargo-inputs (("rust-atty" ,rust-atty-0.2)
+                       ("rust-base64" ,rust-base64-0.12)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-memchr" ,rust-memchr-2)
+                       ("rust-num-cpus" ,rust-num-cpus-1)
+                       ("rust-pear" ,rust-pear-0.1)
+                       ("rust-rocket-codegen" ,rust-rocket-codegen-0.4)
+                       ("rust-rocket-http" ,rust-rocket-http-0.4)
+                       ("rust-state" ,rust-state-0.4)
+                       ("rust-time" ,rust-time-0.1)
+                       ("rust-toml" ,rust-toml-0.4)
+                       ("rust-version-check" ,rust-version-check-0.9)
+                       ("rust-yansi" ,rust-yansi-0.5)
+                       ("rust-yansi" ,rust-yansi-0.5))
+       ;; Adding in missing dev dependency
+       #:cargo-development-inputs (("rust-lazy-static" ,rust-lazy-static-1))
+       #:phases (modify-phases %standard-phases
+                  ;; Enable using nightly/dev features
+                  (add-after 'unpack 'enable-unstable-features
+                    (lambda _
+                      (setenv "RUSTC_BOOTSTRAP" "1"))))))
     (home-page "https://rocket.rs")
     (synopsis
      "Web framework with focus on ease-of-use, expressibility, and speed")
@@ -3696,25 +3735,38 @@ (define-public rust-rocket-0.4
 (define-public rust-rocket-codegen-0.4
   (package
     (name "rust-rocket-codegen")
-    (version "0.4.7")
+    (version "0.4.11")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "rocket_codegen" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "18s2dll8c4sd26s8cfr6cizj5z55xwnk6r6x7b2wvcf8n9ajrb6f"))))
+        (base32 "1zl4f99s4df8fpkps53qn77030baww4x7zflggwql290b1xh6418"))
+       (modules '((guix build utils)))
+       (snippet '(begin
+                   (substitute* "build.rs"
+                     ;; enable nightly/dev in build.rs for RUSTC_BOOTSTRAP build
+                     (("if !channel.supports_features")
+                      "/* if !channel.supports_features")
+                     (("if !version.at_least")
+                      "*/ \nif !version.at_least"))))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-devise" ,rust-devise-0.2)
-        ("rust-glob" ,rust-glob-0.3)
-        ("rust-indexmap" ,rust-indexmap-1)
-        ("rust-quote" ,rust-quote-0.6)
-        ("rust-rocket-http" ,rust-rocket-http-0.4)
-        ("rust-version-check" ,rust-version-check-0.9)
-        ("rust-yansi" ,rust-yansi-0.5))))
+     `(#:tests? #f ;Tests depend on multiple undeclared crates
+       #:cargo-inputs (("rust-devise" ,rust-devise-0.2)
+                       ("rust-glob" ,rust-glob-0.3)
+                       ("rust-indexmap" ,rust-indexmap-1)
+                       ("rust-quote" ,rust-quote-0.6)
+                       ("rust-rocket-http" ,rust-rocket-http-0.4))
+       #:cargo-development-inputs (("rust-version-check" ,rust-version-check-0.9)
+                                   ("rust-yansi" ,rust-yansi-0.5)
+                                   ("rust-rocket" ,rust-rocket-0.4)) ;For tests
+       #:phases (modify-phases %standard-phases
+                  ;; Enable using nightly/dev features
+                  (add-after 'unpack 'enable-unstable-features
+                    (lambda _
+                      (setenv "RUSTC_BOOTSTRAP" "1"))))))
     (home-page "https://rocket.rs")
     (synopsis "Procedural macros for the Rocket web framework")
     (description
@@ -3724,29 +3776,34 @@ (define-public rust-rocket-codegen-0.4
 (define-public rust-rocket-http-0.4
   (package
     (name "rust-rocket-http")
-    (version "0.4.7")
+    (version "0.4.11")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "rocket_http" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0ga98nbcga8amg4xhrfkn1wljnqx9h0vv7mnay9g66vsxl042dnf"))))
+        (base32 "17xiivj4cp3anm4rxxpd8g58kzday1y2pgdys2i23wz1538wpy9b"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-cookie" ,rust-cookie-0.11)
-        ("rust-hyper" ,rust-hyper-0.10)
-        ("rust-hyper-sync-rustls" ,rust-hyper-sync-rustls-0.3)
-        ("rust-indexmap" ,rust-indexmap-1)
-        ("rust-pear" ,rust-pear-0.1)
-        ("rust-percent-encoding" ,rust-percent-encoding-1)
-        ("rust-rustls" ,rust-rustls-0.14)
-        ("rust-smallvec" ,rust-smallvec-1)
-        ("rust-state" ,rust-state-0.4)
-        ("rust-time" ,rust-time-0.1)
-        ("rust-unicode-xid" ,rust-unicode-xid-0.1))))
+     `(#:cargo-test-flags ;doctests depend on undeclared crates
+       '("--lib" "--bins" "--tests" "--release")
+       #:cargo-inputs (("rust-cookie" ,rust-cookie-0.11)
+                       ("rust-hyper" ,rust-hyper-0.10)
+                       ("rust-hyper-sync-rustls" ,rust-hyper-sync-rustls-0.3-rc4)
+                       ("rust-indexmap" ,rust-indexmap-1)
+                       ("rust-pear" ,rust-pear-0.1)
+                       ("rust-percent-encoding" ,rust-percent-encoding-1)
+                       ("rust-rustls" ,rust-rustls-0.14)
+                       ("rust-smallvec" ,rust-smallvec-1)
+                       ("rust-state" ,rust-state-0.4)
+                       ("rust-time" ,rust-time-0.1)
+                       ("rust-unicode-xid" ,rust-unicode-xid-0.1))
+       #:phases (modify-phases %standard-phases
+                  ;; Enable using nightly/dev features
+                  (add-after 'unpack 'enable-unstable-features
+                    (lambda _
+                      (setenv "RUSTC_BOOTSTRAP" "1"))))))
     (home-page "https://rocket.rs")
     (synopsis "HTTP requests, responses and headers tooling for Rocket")
     (description
-- 
2.41.0

[bug#69620] [PATCH rust-team v2 0/2] Update

[Aaron Covrig via Guix-patches via]

Resending with prefered email

Aaron Covrig (2):
  gnu: rust-pear: Added version 0.2.8 with deps
  gnu: rust-rocket: Upgraded and enabled full build

 gnu/packages/crates-io.scm  | 107 +++++++++++++++++-----
 gnu/packages/crates-web.scm | 171 ++++++++++++++++++++++++------------
 2 files changed, 198 insertions(+), 80 deletions(-)


base-commit: d29e5a83e887cd2f4f459a12cbbfc40c77e55ce2
-- 
2.41.0

[bug#69620] [PATCH rust-team v2 1/2] gnu: rust-pear: Added version 0.2.8 with deps

[Aaron Covrig via Guix-patches via]

    * gnu/packages/crates-io.scm (rust-inlinable-string-0.1) : Added inlinable-string version 0.1.15.
    * gnu/packages/crates-io.scm (rust-pear-0.2) : Added version 0.2.8.
    * gnu/packages/crates-io.scm (rust-pear-codengen-0.2) : Changed to full build with tests
    * gnu/packages/crates-io.scm (rust-pear-0.1) : Changed to full build
      with tests
    * gnu/packages/crates-io.scm (rust-pear-codegen-0.1) : Changed to full build
      with tests
---
 gnu/packages/crates-io.scm | 107 +++++++++++++++++++++++++++++--------
 1 file changed, 84 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1a08748392..8a81a75e30 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -30496,6 +30496,31 @@ (define-public rust-inline-c-macro-0.1
 writing and executing C code inside Rust.")
     (license license:bsd-3)))
 
+(define-public rust-inlinable-string-0.1
+  (package
+    (name "rust-inlinable-string")
+    (version "0.1.15")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "inlinable_string" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1ysjci8yfvxgf51z0ny2nnwhxrclhmb3vbngin8v4bznhr3ybyn8"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-serde" ,rust-serde-1))
+       #:cargo-development-inputs (("rust-serde-test" ,rust-serde-test-1))))
+    (home-page "https://github.com/fitzgen/inlinable_string")
+    (synopsis "Provides inline strings that avoid heap-allocation")
+    (description
+     "The @code{inlinable_string} crate provides the @code{InlinableString} type
+-- an owned, grow-able UTF-8 string that stores small strings inline and avoids
+heap-allocation -- and the @code{StringExt} trait which abstracts string
+operations over both @code{std::string::String} and @code{InlinableString} (or
+even your own custom string type)")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-inotify-0.10
   (package
     (name "rust-inotify")
@@ -46264,27 +46289,47 @@ (define-public rust-pdqselect-0.1
 pdqsort.")
     (license (list license:asl2.0 license:expat))))
 
-(define-public rust-pear-0.1
+(define-public rust-pear-0.2
   (package
     (name "rust-pear")
-    (version "0.1.5")
+    (version "0.2.8")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "pear" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "02lnp8c414z5ds0lskd4zxlalrjljzpkg8g6kizszij4h52sgprj"))))
+        (base32 "1j03s6m80iqldnm6jzh3k1fbyk0lxirx8bi4ivgq3k3sq7va1k2c"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-pear-codegen" ,rust-pear-codegen-0.1))))
+     `(#:cargo-inputs (("rust-inlinable-string" ,rust-inlinable-string-0.1)
+                       ("rust-pear-codegen" ,rust-pear-codegen-0.2)
+                       ("rust-yansi" ,rust-yansi-1))))
     (home-page "https://crates.io/crates/pear")
     (synopsis "Pear is a fruit")
     (description "This package provides a pear is a fruit.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-pear-0.1
+  (package
+    (inherit rust-pear-0.2)
+    (name "rust-pear")
+    (version "0.1.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "pear" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "02lnp8c414z5ds0lskd4zxlalrjljzpkg8g6kizszij4h52sgprj"))))
+    (arguments
+     `(#:cargo-inputs (("rust-pear-codegen" ,rust-pear-codegen-0.1))
+       #:phases (modify-phases %standard-phases
+                  ;; Enable using nightly/dev features
+                  (add-after 'unpack 'enable-unstable-features
+                    (lambda _
+                      (setenv "RUSTC_BOOTSTRAP" "1"))))))))
+
 (define-public rust-pear-codegen-0.2
   (package
     (name "rust-pear-codegen")
@@ -46295,19 +46340,25 @@ (define-public rust-pear-codegen-0.2
        (uri (crate-uri "pear_codegen" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0xrwnlncg7l64gfy82vf6kq55ww7p6krq6bc3pqwymxpiq76f8if"))))
+        (base32 "0xrwnlncg7l64gfy82vf6kq55ww7p6krq6bc3pqwymxpiq76f8if"))
+       (modules '((guix build utils)))
+       (snippet '(begin
+                   ;; Add missing development dependency (for tests)
+                   (substitute* "Cargo.toml"
+                     (("\\[dev-dependencies\\]" all)
+                      (string-append "[dev-dependencies.pear]" "\n"
+                                     "version = \"0.2.8\""))) #t))))
     (build-system cargo-build-system)
     (arguments
-     `(#:tests? #f  ; use of undeclared crate or module `pear`
-       #:cargo-inputs
-       (("rust-proc-macro2" ,rust-proc-macro2-1)
-        ("rust-proc-macro2-diagnostics" ,rust-proc-macro2-diagnostics-0.10)
-        ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-2))))
+     `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-proc-macro2-diagnostics" ,rust-proc-macro2-diagnostics-0.10)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2))
+       ;; Add missing dev crate
+       #:cargo-development-inputs (("rust-pear" ,rust-pear-0.2))))
     (home-page "https://crates.io/crates/pear_codegen")
     (synopsis "Codegen for pear")
-    (description
-     "This package provides a (codegen) pear is a fruit.")
+    (description "This package provides a (codegen) pear is a fruit.")
     (license (list license:expat license:asl2.0))))
 
 (define-public rust-pear-codegen-0.1
@@ -46321,15 +46372,25 @@ (define-public rust-pear-codegen-0.1
        (uri (crate-uri "pear_codegen" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "19lcpkfspizd4ywwvca6rxgc311m070k3ndvwa9vrbw1snjqna60"))))
+        (base32 "19lcpkfspizd4ywwvca6rxgc311m070k3ndvwa9vrbw1snjqna60"))
+       (modules '((guix build utils)))
+       (snippet '(begin
+                   (delete-file "build.rs")))))
+    (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-proc-macro2" ,rust-proc-macro2-0.4)
-        ("rust-quote" ,rust-quote-0.6)
-        ("rust-syn" ,rust-syn-0.15)
-        ("rust-version-check" ,rust-version-check-0.9)
-        ("rust-yansi" ,rust-yansi-0.5))))))
+     `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-0.4)
+                       ("rust-quote" ,rust-quote-0.6)
+                       ("rust-syn" ,rust-syn-0.15)
+                       ;; development inputs here to address build issues
+                       ("rust-version-check" ,rust-version-check-0.9)
+                       ("rust-yansi" ,rust-yansi-0.5))
+       #:cargo-development-inputs (("rust-version-check" ,rust-version-check-0.9)
+                                   ("rust-yansi" ,rust-yansi-0.5))
+       #:phases (modify-phases %standard-phases
+                  ;; Enable using nightly/dev features
+                  (add-after 'unpack 'enable-unstable-features
+                    (lambda _
+                      (setenv "RUSTC_BOOTSTRAP" "1"))))))))
 
 (define-public rust-peeking-take-while-0.1
   (package
-- 
2.41.0

[bug#69620] [PATCH rust-team v2 2/2] gnu: rust-rocket: Upgraded and enabled full build

[Aaron Covrig via Guix-patches via]

    * gnu/packages/crates-web.scm (rust-hyper-sync-rustls-0.3) : Upgraded to version 0.3.0-rc17 (and maintained v0.3.0-rc4 as latest has breaking changes)
    * gnu/packages/crates-web.scm (rust-rocket) : Upgraded to v0.4.11 and changed to full build
    * gnu/packages/crates-web.scm (rust-rocket-codegen) : Upgraded to v0.4.11 and changed to build
    * gnu/packages/crates-web.scm (rust-rocket-http) : Upgraded to v0.4.11 and changed to build with tests
---
 gnu/packages/crates-web.scm | 171 ++++++++++++++++++++++++------------
 1 file changed, 114 insertions(+), 57 deletions(-)

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index 60c735efa7..58436084ed 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -42,6 +42,7 @@ (define-module (gnu packages crates-web)
   #:use-module (gnu packages crates-windows)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages gtk)
+  #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages webkit))
@@ -3178,33 +3179,53 @@ (define-public rust-hyper-rustls-0.21
 (define-public rust-hyper-sync-rustls-0.3
   (package
     (name "rust-hyper-sync-rustls")
-    (version "0.3.0-rc.4")
+    (version "0.3.0-rc.17")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "hyper-sync-rustls" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "16zirxhsk26kz5jxxxs37wxsm02id97h57kkqs512fj1j0x486kd"))))
+        (base32 "1az37mc4dgxgpqc745r495nm2dwx48amw2w6c8mnwj00xb219c2c"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-test-flags
-       '("--release" "--"
-         ;; not all files included
-         "--skip=client"
-         "--skip=server")
-       #:cargo-inputs
-       (("rust-hyper" ,rust-hyper-0.10)
-        ("rust-rustls" ,rust-rustls-0.14)
-        ("rust-webpki" ,rust-webpki-0.18)
-        ("rust-webpki-roots" ,rust-webpki-roots-0.15))
-       #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.5))))
+     `(#:cargo-test-flags '("--release" "--"
+                            ;; skip tests client/server tests
+                            "--skip=client" "--skip=server")
+       #:cargo-inputs (("rust-hyper" ,rust-hyper-0.10)
+                       ("rust-rustls" ,rust-rustls-0.17)
+                       ("rust-webpki" ,rust-webpki-0.21)
+                       ("rust-webpki-roots" ,rust-webpki-roots-0.19))
+       #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.7))))
+    (native-inputs (list perl))
     (home-page "https://github.com/SergioBenitez/hyper-sync-rustls")
     (synopsis "Glue code for Rustls and synchronous Hyper")
     (description
      "This package provides glue code for Rustls and synchronous Hyper.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-hyper-sync-rustls-0.3-rc4
+  (package
+    (inherit rust-hyper-sync-rustls-0.3)
+    (name "rust-hyper-sync-rustls")
+    (version "0.3.0-rc.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "hyper-sync-rustls" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "16zirxhsk26kz5jxxxs37wxsm02id97h57kkqs512fj1j0x486kd"))))
+    (arguments
+     `(#:cargo-test-flags '("--release" "--"
+                            ;; not all files included
+                            "--skip=client" "--skip=server")
+       #:cargo-inputs (("rust-hyper" ,rust-hyper-0.10)
+                       ("rust-rustls" ,rust-rustls-0.14)
+                       ("rust-webpki" ,rust-webpki-0.18)
+                       ("rust-webpki-roots" ,rust-webpki-roots-0.15))
+       #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.5))))))
+
 (define-public rust-hyper-timeout-0.4
   (package
     (name "rust-hyper-timeout")
@@ -3659,32 +3680,50 @@ (define-public rust-reqwest-0.10
 (define-public rust-rocket-0.4
   (package
     (name "rust-rocket")
-    (version "0.4.7")
+    (version "0.4.11")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "rocket" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "04ybnhjw92zaan92lsmx6mkhqc9cpsg3885svb3wzyj39pyzvsvz"))))
+        (base32 "0pimz9v0737dvz487j0kij7kasjyahaxd7ba2bcc3p6513fdkfc3"))
+       (modules '((guix build utils)))
+       (snippet '(begin
+                   ;; enable nightly/dev in build.rs for RUSTC_BOOTSTRAP build
+                   (substitute* "build.rs"
+                     (("if !channel.supports_features")
+                      "/* if !channel.supports_features")
+                     (("if !version.at_least")
+                      "*/ \nif !version.at_least"))
+                   ;; Add missing development dependency (for tests)
+                   (substitute* "Cargo.toml"
+                     (("\\[features\\]" all)
+                      (string-append "[dev-dependencies.lazy_static]" "\n"
+                                     "version = \"1\"" "\n" all))) #t))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-atty" ,rust-atty-0.2)
-        ("rust-base64" ,rust-base64-0.12)
-        ("rust-log" ,rust-log-0.4)
-        ("rust-memchr" ,rust-memchr-2)
-        ("rust-num-cpus" ,rust-num-cpus-1)
-        ("rust-pear" ,rust-pear-0.1)
-        ("rust-rocket-codegen" ,rust-rocket-codegen-0.4)
-        ("rust-rocket-http" ,rust-rocket-http-0.4)
-        ("rust-state" ,rust-state-0.4)
-        ("rust-time" ,rust-time-0.1)
-        ("rust-toml" ,rust-toml-0.4)
-        ("rust-version-check" ,rust-version-check-0.9)
-        ("rust-yansi" ,rust-yansi-0.5)
-        ("rust-yansi" ,rust-yansi-0.5))))
+     `(#:cargo-inputs (("rust-atty" ,rust-atty-0.2)
+                       ("rust-base64" ,rust-base64-0.12)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-memchr" ,rust-memchr-2)
+                       ("rust-num-cpus" ,rust-num-cpus-1)
+                       ("rust-pear" ,rust-pear-0.1)
+                       ("rust-rocket-codegen" ,rust-rocket-codegen-0.4)
+                       ("rust-rocket-http" ,rust-rocket-http-0.4)
+                       ("rust-state" ,rust-state-0.4)
+                       ("rust-time" ,rust-time-0.1)
+                       ("rust-toml" ,rust-toml-0.4)
+                       ("rust-version-check" ,rust-version-check-0.9)
+                       ("rust-yansi" ,rust-yansi-0.5)
+                       ("rust-yansi" ,rust-yansi-0.5))
+       ;; Adding in missing dev dependency
+       #:cargo-development-inputs (("rust-lazy-static" ,rust-lazy-static-1))
+       #:phases (modify-phases %standard-phases
+                  ;; Enable using nightly/dev features
+                  (add-after 'unpack 'enable-unstable-features
+                    (lambda _
+                      (setenv "RUSTC_BOOTSTRAP" "1"))))))
     (home-page "https://rocket.rs")
     (synopsis
      "Web framework with focus on ease-of-use, expressibility, and speed")
@@ -3696,25 +3735,38 @@ (define-public rust-rocket-0.4
 (define-public rust-rocket-codegen-0.4
   (package
     (name "rust-rocket-codegen")
-    (version "0.4.7")
+    (version "0.4.11")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "rocket_codegen" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "18s2dll8c4sd26s8cfr6cizj5z55xwnk6r6x7b2wvcf8n9ajrb6f"))))
+        (base32 "1zl4f99s4df8fpkps53qn77030baww4x7zflggwql290b1xh6418"))
+       (modules '((guix build utils)))
+       (snippet '(begin
+                   (substitute* "build.rs"
+                     ;; enable nightly/dev in build.rs for RUSTC_BOOTSTRAP build
+                     (("if !channel.supports_features")
+                      "/* if !channel.supports_features")
+                     (("if !version.at_least")
+                      "*/ \nif !version.at_least"))))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-devise" ,rust-devise-0.2)
-        ("rust-glob" ,rust-glob-0.3)
-        ("rust-indexmap" ,rust-indexmap-1)
-        ("rust-quote" ,rust-quote-0.6)
-        ("rust-rocket-http" ,rust-rocket-http-0.4)
-        ("rust-version-check" ,rust-version-check-0.9)
-        ("rust-yansi" ,rust-yansi-0.5))))
+     `(#:tests? #f ;Tests depend on multiple undeclared crates
+       #:cargo-inputs (("rust-devise" ,rust-devise-0.2)
+                       ("rust-glob" ,rust-glob-0.3)
+                       ("rust-indexmap" ,rust-indexmap-1)
+                       ("rust-quote" ,rust-quote-0.6)
+                       ("rust-rocket-http" ,rust-rocket-http-0.4))
+       #:cargo-development-inputs (("rust-version-check" ,rust-version-check-0.9)
+                                   ("rust-yansi" ,rust-yansi-0.5)
+                                   ("rust-rocket" ,rust-rocket-0.4)) ;For tests
+       #:phases (modify-phases %standard-phases
+                  ;; Enable using nightly/dev features
+                  (add-after 'unpack 'enable-unstable-features
+                    (lambda _
+                      (setenv "RUSTC_BOOTSTRAP" "1"))))))
     (home-page "https://rocket.rs")
     (synopsis "Procedural macros for the Rocket web framework")
     (description
@@ -3724,29 +3776,34 @@ (define-public rust-rocket-codegen-0.4
 (define-public rust-rocket-http-0.4
   (package
     (name "rust-rocket-http")
-    (version "0.4.7")
+    (version "0.4.11")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "rocket_http" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0ga98nbcga8amg4xhrfkn1wljnqx9h0vv7mnay9g66vsxl042dnf"))))
+        (base32 "17xiivj4cp3anm4rxxpd8g58kzday1y2pgdys2i23wz1538wpy9b"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-cookie" ,rust-cookie-0.11)
-        ("rust-hyper" ,rust-hyper-0.10)
-        ("rust-hyper-sync-rustls" ,rust-hyper-sync-rustls-0.3)
-        ("rust-indexmap" ,rust-indexmap-1)
-        ("rust-pear" ,rust-pear-0.1)
-        ("rust-percent-encoding" ,rust-percent-encoding-1)
-        ("rust-rustls" ,rust-rustls-0.14)
-        ("rust-smallvec" ,rust-smallvec-1)
-        ("rust-state" ,rust-state-0.4)
-        ("rust-time" ,rust-time-0.1)
-        ("rust-unicode-xid" ,rust-unicode-xid-0.1))))
+     `(#:cargo-test-flags ;doctests depend on undeclared crates
+       '("--lib" "--bins" "--tests" "--release")
+       #:cargo-inputs (("rust-cookie" ,rust-cookie-0.11)
+                       ("rust-hyper" ,rust-hyper-0.10)
+                       ("rust-hyper-sync-rustls" ,rust-hyper-sync-rustls-0.3-rc4)
+                       ("rust-indexmap" ,rust-indexmap-1)
+                       ("rust-pear" ,rust-pear-0.1)
+                       ("rust-percent-encoding" ,rust-percent-encoding-1)
+                       ("rust-rustls" ,rust-rustls-0.14)
+                       ("rust-smallvec" ,rust-smallvec-1)
+                       ("rust-state" ,rust-state-0.4)
+                       ("rust-time" ,rust-time-0.1)
+                       ("rust-unicode-xid" ,rust-unicode-xid-0.1))
+       #:phases (modify-phases %standard-phases
+                  ;; Enable using nightly/dev features
+                  (add-after 'unpack 'enable-unstable-features
+                    (lambda _
+                      (setenv "RUSTC_BOOTSTRAP" "1"))))))
     (home-page "https://rocket.rs")
     (synopsis "HTTP requests, responses and headers tooling for Rocket")
     (description
-- 
2.41.0

[bug#69620] [rust-team v3 0/9] Enables building of rust-rocket

[Aaron Covrig via Guix-patches via]

The following updates (in issue https://issues.guix.gnu.org/69620)
enable building rust-rocket and rust-pear along with updating their
versions. To enable building these packages nightly/bootstrap features
are turned on as required and several development dependencies that have
been stripped out (of the published crates.io packages) have been added
back (as found on the appropriate git hosting sites). Furthermore,
rust-hyper-sync-rustls-0.3 is now split into two versions, rc.17 and
rc.4 as rc.17 is not 100% backwards compatible with rc.4.

Aaron Covrig (9):
  gnu: Add rust-inlinable-string-0.1
  gnu: Enables rust-pear-codegen-0.2 tests
  gnu: Enables building rust-pear-codegen-0.1
  gnu: Enables building rust-pear-0.1
  gnu: Bumps rust-hyper-sync-rustls to 0.3.0-rc.17
  gnu: Bumps rust-rocket-codegen-0.4 to 0.4.11
  gnu: Bumps rust-rocket-http-0.4 to 0.4.11
  gnu: Bumps rust-rocket-0.4 to 0.4.11
  gnu: Bumps rust-pear to v0.2.9

 gnu/packages/crates-io.scm  |  90 ++++++++++++++-----
 gnu/packages/crates-web.scm | 175 ++++++++++++++++++++++++------------
 2 files changed, 184 insertions(+), 81 deletions(-)


base-commit: edcc8778feb07be4086a6e557be6ac2175c31fcf
-- 
2.41.0

[bug#69620] [rust-team v3 1/9] gnu: Add rust-inlinable-string-0.1

[Aaron Covrig via Guix-patches via]

* gnu/packages/crates-io.scm (rust-inlinable-string-0.1): Add variable
---
 gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 4eee577e59..ea8dcb5cec 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -42,6 +42,7 @@
 ;;; Copyright © 2024 Herman Rimm <herman@rimm.ee>
 ;;; Copyright © 2024 Tomas Volf <~@wolfsden.cz>
 ;;; Copyright © 2024 Suhail Singh <suhail@bayesians.ca>
+;;; Copyright © 2024 Aaron Covrig <aaron.covrig.us@ieee.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -32398,6 +32399,31 @@ (define-public rust-inline-c-macro-0.1
 writing and executing C code inside Rust.")
     (license license:bsd-3)))
 
+(define-public rust-inlinable-string-0.1
+  (package
+    (name "rust-inlinable-string")
+    (version "0.1.15")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "inlinable_string" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1ysjci8yfvxgf51z0ny2nnwhxrclhmb3vbngin8v4bznhr3ybyn8"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-serde" ,rust-serde-1))
+       #:cargo-development-inputs (("rust-serde-test" ,rust-serde-test-1))))
+    (home-page "https://github.com/fitzgen/inlinable_string")
+    (synopsis "Provides inline strings that avoid heap-allocation")
+    (description
+     "The @code{inlinable_string} crate provides the @code{InlinableString} type
+-- an owned, grow-able UTF-8 string that stores small strings inline and avoids
+heap-allocation -- and the @code{StringExt} trait which abstracts string
+operations over both @code{std::string::String} and @code{InlinableString} (or
+even your own custom string type)")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-inotify-0.10
   (package
     (name "rust-inotify")
-- 
2.41.0

[bug#69620] [rust-team v3 2/9] gnu: Enables rust-pear-codegen-0.2 tests

[Aaron Covrig via Guix-patches via]

* gnu/packages/crates-io.scm (rust-pear-codegen-0.2): Enables building
  test cases by adding stripped out development input (rust-pear-0.2)
---
 gnu/packages/crates-io.scm | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ea8dcb5cec..492c077eae 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -49315,19 +49315,25 @@ (define-public rust-pear-codegen-0.2
        (uri (crate-uri "pear_codegen" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0xrwnlncg7l64gfy82vf6kq55ww7p6krq6bc3pqwymxpiq76f8if"))))
+        (base32 "0xrwnlncg7l64gfy82vf6kq55ww7p6krq6bc3pqwymxpiq76f8if"))
+       (modules '((guix build utils)))
+       (snippet '(begin
+                   ;; Add missing development dependency (for tests)
+                   (substitute* "Cargo.toml"
+                     (("\\[dev-dependencies\\]" all)
+                      (string-append "[dev-dependencies.pear]" "\n"
+                                     "version = \"0.2.8\""))) #t))))
     (build-system cargo-build-system)
     (arguments
-     `(#:tests? #f  ; use of undeclared crate or module `pear`
-       #:cargo-inputs
-       (("rust-proc-macro2" ,rust-proc-macro2-1)
-        ("rust-proc-macro2-diagnostics" ,rust-proc-macro2-diagnostics-0.10)
-        ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-2))))
+     `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-proc-macro2-diagnostics" ,rust-proc-macro2-diagnostics-0.10)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2))
+       ;; Add missing dev crate
+       #:cargo-development-inputs (("rust-pear" ,rust-pear-0.2))))
     (home-page "https://crates.io/crates/pear_codegen")
     (synopsis "Codegen for pear")
-    (description
-     "This package provides a (codegen) pear is a fruit.")
+    (description "This package provides a (codegen) pear is a fruit.")
     (license (list license:expat license:asl2.0))))
 
 (define-public rust-pear-codegen-0.1
-- 
2.41.0

[bug#69620] [rust-team v3 3/9] gnu: Enables building rust-pear-codegen-0.1

[Aaron Covrig via Guix-patches via]

* gnu/packages/crates-io.scm (rust-pear-codegen-0.1): Enables full build
  with tests
---
 gnu/packages/crates-io.scm | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 492c077eae..ada42a1b92 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -49347,15 +49347,25 @@ (define-public rust-pear-codegen-0.1
        (uri (crate-uri "pear_codegen" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "19lcpkfspizd4ywwvca6rxgc311m070k3ndvwa9vrbw1snjqna60"))))
+        (base32 "19lcpkfspizd4ywwvca6rxgc311m070k3ndvwa9vrbw1snjqna60"))
+       (modules '((guix build utils)))
+       (snippet '(begin
+                   (delete-file "build.rs")))))
+    (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-proc-macro2" ,rust-proc-macro2-0.4)
-        ("rust-quote" ,rust-quote-0.6)
-        ("rust-syn" ,rust-syn-0.15)
-        ("rust-version-check" ,rust-version-check-0.9)
-        ("rust-yansi" ,rust-yansi-0.5))))))
+     `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-0.4)
+                       ("rust-quote" ,rust-quote-0.6)
+                       ("rust-syn" ,rust-syn-0.15)
+                       ;; development inputs here to address build issues
+                       ("rust-version-check" ,rust-version-check-0.9)
+                       ("rust-yansi" ,rust-yansi-0.5))
+       #:cargo-development-inputs (("rust-version-check" ,rust-version-check-0.9)
+                                   ("rust-yansi" ,rust-yansi-0.5))
+       #:phases (modify-phases %standard-phases
+                  ;; Enable using nightly/dev features
+                  (add-after 'unpack 'enable-unstable-features
+                    (lambda _
+                      (setenv "RUSTC_BOOTSTRAP" "1"))))))))
 
 (define-public rust-peeking-take-while-0.1
   (package
-- 
2.41.0

[bug#69620] [rust-team v3 4/9] gnu: Enables building rust-pear-0.1

[Aaron Covrig via Guix-patches via]

* gnu/packages/crates-io.scm (rust-pear-0.1): Enables full build with
  tests
---
 gnu/packages/crates-io.scm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ada42a1b92..4edb11f3b9 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -49302,8 +49302,12 @@ (define-public rust-pear-0.1
        (sha256
         (base32 "02lnp8c414z5ds0lskd4zxlalrjljzpkg8g6kizszij4h52sgprj"))))
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs (("rust-pear-codegen" ,rust-pear-codegen-0.1))))))
+     `(#:cargo-inputs (("rust-pear-codegen" ,rust-pear-codegen-0.1))
+       #:phases (modify-phases %standard-phases
+                  ;; Enable using nightly/dev features
+                  (add-after 'unpack 'enable-unstable-features
+                    (lambda _
+                      (setenv "RUSTC_BOOTSTRAP" "1"))))))))
 
 (define-public rust-pear-codegen-0.2
   (package
-- 
2.41.0

[bug#69620] [rust-team v3 5/9] gnu: Bumps rust-hyper-sync-rustls to 0.3.0-rc.17

[Aaron Covrig via Guix-patches via]

* gnu/packages/crates-web.scm (rust-hyper-sync-rustls-0.3): Bumps to
  0.3.0-rc.17
* gnu/packages/crates-web.scm (rust-hyper-sync-rustls-0.3-rc.4): New
  variable (rc.17 is not backwards compatible with rc.4)
---
 gnu/packages/crates-web.scm | 47 +++++++++++++++++++++++++++----------
 1 file changed, 34 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index 9b2d27dc69..d1cc9768de 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -42,6 +42,7 @@ (define-module (gnu packages crates-web)
   #:use-module (gnu packages crates-windows)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages gtk)
+  #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages webkit))
@@ -3776,33 +3777,53 @@ (define-public rust-hyper-rustls-0.21
 (define-public rust-hyper-sync-rustls-0.3
   (package
     (name "rust-hyper-sync-rustls")
-    (version "0.3.0-rc.4")
+    (version "0.3.0-rc.17")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "hyper-sync-rustls" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "16zirxhsk26kz5jxxxs37wxsm02id97h57kkqs512fj1j0x486kd"))))
+        (base32 "1az37mc4dgxgpqc745r495nm2dwx48amw2w6c8mnwj00xb219c2c"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-test-flags
-       '("--release" "--"
-         ;; not all files included
-         "--skip=client"
-         "--skip=server")
-       #:cargo-inputs
-       (("rust-hyper" ,rust-hyper-0.10)
-        ("rust-rustls" ,rust-rustls-0.14)
-        ("rust-webpki" ,rust-webpki-0.18)
-        ("rust-webpki-roots" ,rust-webpki-roots-0.15))
-       #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.5))))
+     `(#:cargo-test-flags '("--release" "--"
+                            ;; skip tests client/server tests
+                            "--skip=client" "--skip=server")
+       #:cargo-inputs (("rust-hyper" ,rust-hyper-0.10)
+                       ("rust-rustls" ,rust-rustls-0.17)
+                       ("rust-webpki" ,rust-webpki-0.21)
+                       ("rust-webpki-roots" ,rust-webpki-roots-0.19))
+       #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.7))))
+    (native-inputs (list perl))
     (home-page "https://github.com/SergioBenitez/hyper-sync-rustls")
     (synopsis "Glue code for Rustls and synchronous Hyper")
     (description
      "This package provides glue code for Rustls and synchronous Hyper.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-hyper-sync-rustls-0.3-rc4
+  (package
+    (inherit rust-hyper-sync-rustls-0.3)
+    (name "rust-hyper-sync-rustls")
+    (version "0.3.0-rc.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "hyper-sync-rustls" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "16zirxhsk26kz5jxxxs37wxsm02id97h57kkqs512fj1j0x486kd"))))
+    (arguments
+     `(#:cargo-test-flags '("--release" "--"
+                            ;; not all files included
+                            "--skip=client" "--skip=server")
+       #:cargo-inputs (("rust-hyper" ,rust-hyper-0.10)
+                       ("rust-rustls" ,rust-rustls-0.14)
+                       ("rust-webpki" ,rust-webpki-0.18)
+                       ("rust-webpki-roots" ,rust-webpki-roots-0.15))
+       #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.5))))))
+
 (define-public rust-hyper-timeout-0.4
   (package
     (name "rust-hyper-timeout")
-- 
2.41.0

[bug#69620] [rust-team v3 6/9] gnu: Bumps rust-rocket-codegen-0.4 to 0.4.11

[Aaron Covrig via Guix-patches via]

* gnu/packages/crates-web.scm (rust-rocket-codegen-0.4): Bumps to 0.4.11
  and enables building
---
 gnu/packages/crates-web.scm | 37 +++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index d1cc9768de..e105ddae66 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -4698,24 +4698,37 @@ (define-public rust-rocket-codegen-0.4
   (package
     (inherit rust-rocket-codegen-0.5)
     (name "rust-rocket-codegen")
-    (version "0.4.7")
+    (version "0.4.11")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "rocket_codegen" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "18s2dll8c4sd26s8cfr6cizj5z55xwnk6r6x7b2wvcf8n9ajrb6f"))))
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-devise" ,rust-devise-0.2)
-        ("rust-glob" ,rust-glob-0.3)
-        ("rust-indexmap" ,rust-indexmap-1)
-        ("rust-quote" ,rust-quote-0.6)
-        ("rust-rocket-http" ,rust-rocket-http-0.4)
-        ("rust-version-check" ,rust-version-check-0.9)
-        ("rust-yansi" ,rust-yansi-0.5))))))
+        (base32 "1zl4f99s4df8fpkps53qn77030baww4x7zflggwql290b1xh6418"))
+       (modules '((guix build utils)))
+       (snippet '(begin
+                   (substitute* "build.rs"
+                     ;; enable nightly/dev in build.rs for RUSTC_BOOTSTRAP build
+                     (("if !channel.supports_features")
+                      "/* if !channel.supports_features")
+                     (("if !version.at_least")
+                      "*/ \nif !version.at_least"))))))
+    (arguments
+     `(#:tests? #f ;Tests depend on multiple undeclared crates
+       #:cargo-inputs (("rust-devise" ,rust-devise-0.2)
+                       ("rust-glob" ,rust-glob-0.3)
+                       ("rust-indexmap" ,rust-indexmap-1)
+                       ("rust-quote" ,rust-quote-0.6)
+                       ("rust-rocket-http" ,rust-rocket-http-0.4))
+       #:cargo-development-inputs (("rust-version-check" ,rust-version-check-0.9)
+                                   ("rust-yansi" ,rust-yansi-0.5)
+                                   ("rust-rocket" ,rust-rocket-0.4)) ;For tests
+       #:phases (modify-phases %standard-phases
+                  ;; Enable using nightly/dev features
+                  (add-after 'unpack 'enable-unstable-features
+                    (lambda _
+                      (setenv "RUSTC_BOOTSTRAP" "1"))))))))
 
 (define-public rust-rocket-http-0.5
   (package
-- 
2.41.0

[bug#69620] [rust-team v3 7/9] gnu: Bumps rust-rocket-http-0.4 to 0.4.11

[Aaron Covrig via Guix-patches via]

* gnu/packages/crates-web.scm (rust-rocket-http-0.4): Bumps to 0.4.11
  and enables building
---
 gnu/packages/crates-web.scm | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index e105ddae66..fbdce9e9f6 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -4779,28 +4779,33 @@ (define-public rust-rocket-http-0.4
   (package
     (inherit rust-rocket-http-0.5)
     (name "rust-rocket-http")
-    (version "0.4.7")
+    (version "0.4.11")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "rocket_http" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0ga98nbcga8amg4xhrfkn1wljnqx9h0vv7mnay9g66vsxl042dnf"))))
+        (base32 "17xiivj4cp3anm4rxxpd8g58kzday1y2pgdys2i23wz1538wpy9b"))))
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-cookie" ,rust-cookie-0.11)
-        ("rust-hyper" ,rust-hyper-0.10)
-        ("rust-hyper-sync-rustls" ,rust-hyper-sync-rustls-0.3)
-        ("rust-indexmap" ,rust-indexmap-1)
-        ("rust-pear" ,rust-pear-0.1)
-        ("rust-percent-encoding" ,rust-percent-encoding-1)
-        ("rust-rustls" ,rust-rustls-0.14)
-        ("rust-smallvec" ,rust-smallvec-1)
-        ("rust-state" ,rust-state-0.4)
-        ("rust-time" ,rust-time-0.1)
-        ("rust-unicode-xid" ,rust-unicode-xid-0.1))))))
+     `(#:cargo-test-flags ;doctests depend on undeclared crates
+       '("--lib" "--bins" "--tests" "--release")
+       #:cargo-inputs (("rust-cookie" ,rust-cookie-0.11)
+                       ("rust-hyper" ,rust-hyper-0.10)
+                       ("rust-hyper-sync-rustls" ,rust-hyper-sync-rustls-0.3-rc4)
+                       ("rust-indexmap" ,rust-indexmap-1)
+                       ("rust-pear" ,rust-pear-0.1)
+                       ("rust-percent-encoding" ,rust-percent-encoding-1)
+                       ("rust-rustls" ,rust-rustls-0.14)
+                       ("rust-smallvec" ,rust-smallvec-1)
+                       ("rust-state" ,rust-state-0.4)
+                       ("rust-time" ,rust-time-0.1)
+                       ("rust-unicode-xid" ,rust-unicode-xid-0.1))
+       #:phases (modify-phases %standard-phases
+                  ;; Enable using nightly/dev features
+                  (add-after 'unpack 'enable-unstable-features
+                    (lambda _
+                      (setenv "RUSTC_BOOTSTRAP" "1"))))))))
 
 (define-public rust-salvo-0.16
   (package
-- 
2.41.0

[bug#69620] [rust-team v3 8/9] gnu: Bumps rust-rocket-0.4 to 0.4.11

[Aaron Covrig via Guix-patches via]

* gnu/packages/crates-web.scm (rust-rocket-0.4): Bumps to 0.4.11 and
  enables building
---
 gnu/packages/crates-web.scm | 56 ++++++++++++++++++++++++-------------
 1 file changed, 37 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index fbdce9e9f6..bf848a9f54 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -4634,31 +4634,49 @@ (define-public rust-rocket-0.4
   (package
     (inherit rust-rocket-0.5)
     (name "rust-rocket")
-    (version "0.4.7")
+    (version "0.4.11")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "rocket" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "04ybnhjw92zaan92lsmx6mkhqc9cpsg3885svb3wzyj39pyzvsvz"))))
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-atty" ,rust-atty-0.2)
-        ("rust-base64" ,rust-base64-0.12)
-        ("rust-log" ,rust-log-0.4)
-        ("rust-memchr" ,rust-memchr-2)
-        ("rust-num-cpus" ,rust-num-cpus-1)
-        ("rust-pear" ,rust-pear-0.1)
-        ("rust-rocket-codegen" ,rust-rocket-codegen-0.4)
-        ("rust-rocket-http" ,rust-rocket-http-0.4)
-        ("rust-state" ,rust-state-0.4)
-        ("rust-time" ,rust-time-0.1)
-        ("rust-toml" ,rust-toml-0.4)
-        ("rust-version-check" ,rust-version-check-0.9)
-        ("rust-yansi" ,rust-yansi-0.5)
-        ("rust-yansi" ,rust-yansi-0.5))))))
+        (base32 "0pimz9v0737dvz487j0kij7kasjyahaxd7ba2bcc3p6513fdkfc3"))
+       (modules '((guix build utils)))
+       (snippet '(begin
+                   ;; enable nightly/dev in build.rs for RUSTC_BOOTSTRAP build
+                   (substitute* "build.rs"
+                     (("if !channel.supports_features")
+                      "/* if !channel.supports_features")
+                     (("if !version.at_least")
+                      "*/ \nif !version.at_least"))
+                   ;; Add missing development dependency (for tests)
+                   (substitute* "Cargo.toml"
+                     (("\\[features\\]" all)
+                      (string-append "[dev-dependencies.lazy_static]" "\n"
+                                     "version = \"1\"" "\n" all))) #t))))
+    (arguments
+     `(#:cargo-inputs (("rust-atty" ,rust-atty-0.2)
+                       ("rust-base64" ,rust-base64-0.12)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-memchr" ,rust-memchr-2)
+                       ("rust-num-cpus" ,rust-num-cpus-1)
+                       ("rust-pear" ,rust-pear-0.1)
+                       ("rust-rocket-codegen" ,rust-rocket-codegen-0.4)
+                       ("rust-rocket-http" ,rust-rocket-http-0.4)
+                       ("rust-state" ,rust-state-0.4)
+                       ("rust-time" ,rust-time-0.1)
+                       ("rust-toml" ,rust-toml-0.4)
+                       ("rust-version-check" ,rust-version-check-0.9)
+                       ("rust-yansi" ,rust-yansi-0.5)
+                       ("rust-yansi" ,rust-yansi-0.5))
+       ;; Adding in missing dev dependency
+       #:cargo-development-inputs (("rust-lazy-static" ,rust-lazy-static-1))
+       #:phases (modify-phases %standard-phases
+                  ;; Enable using nightly/dev features
+                  (add-after 'unpack 'enable-unstable-features
+                    (lambda _
+                      (setenv "RUSTC_BOOTSTRAP" "1"))))))))
 
 (define-public rust-rocket-codegen-0.5
   (package
-- 
2.41.0

[bug#69620] [rust-team v3 9/9] gnu: Bumps rust-pear to v0.2.9

[Aaron Covrig via Guix-patches via]

* gnu/packages/crates-web.scm (rust-pear-0.2): Bumps to 0.2.9
* gnu/packages/crates-web.scm (rust-pear-codegen-0.2): Bumps to 0.2.9
---
 gnu/packages/crates-io.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 4edb11f3b9..d0dbadd230 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -49271,14 +49271,14 @@ (define-public rust-pdqselect-0.1
 (define-public rust-pear-0.2
   (package
     (name "rust-pear")
-    (version "0.2.8")
+    (version "0.2.9")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "pear" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1j03s6m80iqldnm6jzh3k1fbyk0lxirx8bi4ivgq3k3sq7va1k2c"))))
+        (base32 "0rxlyizzaqq6lswgyfdxjxd3dyb1jfml9gwfpbx5g1j8rq0amvmx"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs (("rust-inlinable-string" ,rust-inlinable-string-0.1)
@@ -49312,21 +49312,21 @@ (define-public rust-pear-0.1
 (define-public rust-pear-codegen-0.2
   (package
     (name "rust-pear-codegen")
-    (version "0.2.8")
+    (version "0.2.9")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "pear_codegen" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0xrwnlncg7l64gfy82vf6kq55ww7p6krq6bc3pqwymxpiq76f8if"))
+        (base32 "0izijffdd2xs762497mk0xr7xwmyw62dzdqjz12v70n0bnc5pasb"))
        (modules '((guix build utils)))
        (snippet '(begin
                    ;; Add missing development dependency (for tests)
                    (substitute* "Cargo.toml"
                      (("\\[dev-dependencies\\]" all)
                       (string-append "[dev-dependencies.pear]" "\n"
-                                     "version = \"0.2.8\""))) #t))))
+                                     "version = \"0.2.9\""))) #t))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
-- 
2.41.0

[bug#69620] [PATCH rust-team v4 1/5] gnu: rust-is-terminal-0.4: Update to 0.4.13

[Aaron Covrig via Guix-patches via]

* gnu/packages/crates-io.scm (rust-is-terminal-0.4): Update to 0.4.13
---
 gnu/packages/crates-io.scm | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 7c66d0c0ed..d02a8213d1 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -35792,25 +35792,24 @@ (define-public rust-is-executable-1
 (define-public rust-is-terminal-0.4
   (package
     (name "rust-is-terminal")
-    (version "0.4.10")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "is-terminal" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0m9la3f7cs77y85nkbcjsxkb7k861fc6bdhahyfidgh7gljh1b8b"))))
+    (version "0.4.13")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "is-terminal" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0jwgjjz33kkmnwai3nsdk1pz9vb6gkqvw1d1vq7bs3q48kinh7r6"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-hermit-abi" ,rust-hermit-abi-0.3)
-        ("rust-rustix" ,rust-rustix-0.38)
-        ("rust-windows-sys" ,rust-windows-sys-0.52))
-       #:cargo-development-inputs
-       (("rust-atty" ,rust-atty-0.2)
-        ("rust-libc" ,rust-libc-0.2)
-        ("rust-rustix" ,rust-rustix-0.38)
-        ("rust-tempfile" ,rust-tempfile-3))))
+     (list
+      #:cargo-inputs `(("rust-hermit-abi" ,rust-hermit-abi-0.4)
+                       ("rust-rustix" ,rust-rustix-0.38)
+                       ("rust-windows-sys" ,rust-windows-sys-0.52))
+      #:cargo-development-inputs `(("rust-atty" ,rust-atty-0.2)
+                                   ("rust-libc" ,rust-libc-0.2)
+                                   ("rust-rustix" ,rust-rustix-0.38)
+                                   ("rust-tempfile" ,rust-tempfile-3))))
     (home-page "https://github.com/sunfishcode/is-terminal")
     (synopsis "Test whether a given stream is a terminal")
     (description

base-commit: cd51ccab9652778a37f9b407261e3d49221ed68c
-- 
2.46.0

[bug#69620] [PATCH rust-team v4 2/5] gnu: rust-yansi: Update to 1.0.1

[Aaron Covrig via Guix-patches via]

* gnu/packages/crates-io.scm (rust-yansi-1): Update to 1.0.1
---
 gnu/packages/crates-io.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d02a8213d1..d4bbde1200 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -92817,17 +92817,18 @@ (define-public rust-yaml-rust-0.3
 (define-public rust-yansi-1
   (package
     (name "rust-yansi")
-    (version "1.0.0-rc.1")
+    (version "1.0.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "yansi" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0xr3n41j5v00scfkac2d6vhkxiq9nz3l5j6vw8f3g3bqixdjjrqk"))))
+        (base32 "0jdh55jyv0dpd38ij4qh60zglbw9aa8wafqai6m0wa7xaxk3mrfg"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs (("rust-is-terminal" ,rust-is-terminal-0.4))))
+     (list
+      #:cargo-inputs `(("rust-is-terminal" ,rust-is-terminal-0.4))))
     (home-page "https://github.com/SergioBenitez/yansi")
     (synopsis "Simple ANSI terminal color painting library")
     (description
-- 
2.46.0

[bug#69620] [PATCH rust-team v4 3/5] gnu: rust-pear: Update to 0.2.9

[Aaron Covrig via Guix-patches via]

* gnu/packages/crates-io.scm (rust-pear-0.2): Update to 0.2.9
* gnu/packages/crates-io.scm (rust-pear-codegen-0.2): Update to 0.2.9
---
 gnu/packages/crates-io.scm | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d4bbde1200..dd26496ece 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -53056,17 +53056,18 @@ (define-public rust-pdqselect-0.1
 (define-public rust-pear-0.2
   (package
     (name "rust-pear")
-    (version "0.2.8")
+    (version "0.2.9")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "pear" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1j03s6m80iqldnm6jzh3k1fbyk0lxirx8bi4ivgq3k3sq7va1k2c"))))
+        (base32 "0rxlyizzaqq6lswgyfdxjxd3dyb1jfml9gwfpbx5g1j8rq0amvmx"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs (("rust-inlinable-string" ,rust-inlinable-string-0.1)
+     (list
+      #:cargo-inputs `(("rust-inlinable-string" ,rust-inlinable-string-0.1)
                        ("rust-pear-codegen" ,rust-pear-codegen-0.2)
                        ("rust-yansi" ,rust-yansi-1))))
     (home-page "https://crates.io/crates/pear")
@@ -53093,26 +53094,33 @@ (define-public rust-pear-0.1
 (define-public rust-pear-codegen-0.2
   (package
     (name "rust-pear-codegen")
-    (version "0.2.8")
+    (version "0.2.9")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "pear_codegen" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0xrwnlncg7l64gfy82vf6kq55ww7p6krq6bc3pqwymxpiq76f8if"))))
+        (base32 "0izijffdd2xs762497mk0xr7xwmyw62dzdqjz12v70n0bnc5pasb"))
+       (modules '((guix build utils)))
+       (snippet '(begin
+                   ;; Add missing development dependency (for tests)
+                   (substitute* "Cargo.toml"
+                     (("\\[dev-dependencies\\]" all)
+                      (string-append "[dev-dependencies.pear]" "\n"
+                                     "version = \"0.2.9\""))) #t))))
     (build-system cargo-build-system)
     (arguments
-     `(#:tests? #f  ; use of undeclared crate or module `pear`
-       #:cargo-inputs
-       (("rust-proc-macro2" ,rust-proc-macro2-1)
-        ("rust-proc-macro2-diagnostics" ,rust-proc-macro2-diagnostics-0.10)
-        ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-2))))
+     (list
+      #:cargo-inputs `(("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-proc-macro2-diagnostics" ,rust-proc-macro2-diagnostics-0.10)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2))
+      ;; Add missing dev crate
+      #:cargo-development-inputs `(("rust-pear" ,rust-pear-0.2))))
     (home-page "https://crates.io/crates/pear_codegen")
     (synopsis "Codegen for pear")
-    (description
-     "This package provides a (codegen) pear is a fruit.")
+    (description "This package provides a (codegen) pear is a fruit.")
     (license (list license:expat license:asl2.0))))
 
 (define-public rust-pear-codegen-0.1
-- 
2.46.0

[bug#69620] [PATCH rust-team v4 4/5] gnu: rust-rocket: Update to 0.5.1

[Aaron Covrig via Guix-patches via]

* gnu/packages/crates-web.scm (rust-rocket-0.5): Update to 0.5.1
* gnu/packages/crates-web.scm (rust-rocket-codegen-0.5): Update to 0.5.1
* gnu/packages/crates-web.scm (rust-rocket-http-0.5): Update to 0.5.1
---
 gnu/packages/crates-web.scm | 41 ++++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index c17402e335..70158c7f60 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -10,6 +10,7 @@
 ;;; Copyright © 2024 Wilko Meyer <w@wmeyer.eu>
 ;;; Copyright © 2024 Tomas Volf <~@wolfsden.cz>
 ;;; Copyright © 2024 Nguyễn Gia Phong <mcsinyx@disroot.org>
+;;; Copyright © 2024 Aaron Covrig <aaron.covrig.us@ieee.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -4862,17 +4863,18 @@ (define-public rust-rfc7239-0.1
 (define-public rust-rocket-0.5
   (package
     (name "rust-rocket")
-    (version "0.5.0")
+    (version "0.5.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "rocket" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0l4i93dai7pyzlkvdjkqg2g7ni1r6749cwx4nrrhsrr6rdybaywy"))))
+        (base32 "0gypf9z6s0kshv33qq1vf16raw8xnr1p03ii0kfgf7d3jrr905m5"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs (("rust-async-stream" ,rust-async-stream-0.3)
+     (list
+      #:cargo-inputs `(("rust-async-stream" ,rust-async-stream-0.3)
                        ("rust-async-trait" ,rust-async-trait-0.1)
                        ("rust-atomic" ,rust-atomic-0.5)
                        ("rust-binascii" ,rust-binascii-0.1)
@@ -4883,7 +4885,7 @@ (define-public rust-rocket-0.5
                        ("rust-indexmap" ,rust-indexmap-2)
                        ("rust-log" ,rust-log-0.4)
                        ("rust-memchr" ,rust-memchr-2)
-                       ("rust-multer" ,rust-multer-2)
+                       ("rust-multer" ,rust-multer-3)
                        ("rust-num-cpus" ,rust-num-cpus-1)
                        ("rust-parking-lot" ,rust-parking-lot-0.12)
                        ("rust-pin-project-lite" ,rust-pin-project-lite-0.2)
@@ -4902,9 +4904,9 @@ (define-public rust-rocket-0.5
                        ("rust-tokio-util" ,rust-tokio-util-0.7)
                        ("rust-ubyte" ,rust-ubyte-0.10)
                        ("rust-uuid" ,rust-uuid-1)
-                       ("rust-version-check" ,rust-version-check-0.9)
                        ("rust-yansi" ,rust-yansi-1))
-       #:cargo-development-inputs (("rust-figment" ,rust-figment-0.10)
+      #:cargo-development-inputs `(("rust-version-check" ,rust-version-check-0.9)
+                                   ("rust-figment" ,rust-figment-0.10)
                                    ("rust-pretty-assertions" ,rust-pretty-assertions-1))))
     (home-page "https://rocket.rs")
     (synopsis
@@ -4947,18 +4949,19 @@ (define-public rust-rocket-0.4
 (define-public rust-rocket-codegen-0.5
   (package
     (name "rust-rocket-codegen")
-    (version "0.5.0")
+    (version "0.5.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "rocket_codegen" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0k6hdf9s9y73kzj89qs688gnfjj1sl4imp6pdjz22pzpmdk808x2"))))
+        (base32 "0inxw7nzr52sabwpz83cz5rh1a0mg32cg7w7ih8715qsxkbk4pap"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:tests? #f      ; can't find crate for `rocket`
-       #:cargo-inputs (("rust-devise" ,rust-devise-0.4)
+     (list
+      #:tests? #f ;can't find crate for `rocket`
+      #:cargo-inputs `(("rust-devise" ,rust-devise-0.4)
                        ("rust-glob" ,rust-glob-0.3)
                        ("rust-indexmap" ,rust-indexmap-2)
                        ("rust-proc-macro2" ,rust-proc-macro2-1)
@@ -4967,11 +4970,10 @@ (define-public rust-rocket-codegen-0.5
                        ("rust-syn" ,rust-syn-2)
                        ("rust-unicode-xid" ,rust-unicode-xid-0.2)
                        ("rust-version-check" ,rust-version-check-0.9))
-       #:cargo-development-inputs
-       (("rust-pretty-assertions" ,rust-pretty-assertions-1)
-        ("rust-time" ,rust-time-0.3)
-        ("rust-trybuild" ,rust-trybuild-1)
-        ("rust-version-check" ,rust-version-check-0.9))))
+      #:cargo-development-inputs `(("rust-pretty-assertions" ,rust-pretty-assertions-1)
+                                   ("rust-time" ,rust-time-0.3)
+                                   ("rust-trybuild" ,rust-trybuild-1)
+                                   ("rust-version-check" ,rust-version-check-0.9))))
     (home-page "https://rocket.rs")
     (synopsis "Procedural macros for the Rocket web framework")
     (description
@@ -5004,18 +5006,19 @@ (define-public rust-rocket-codegen-0.4
 (define-public rust-rocket-http-0.5
   (package
     (name "rust-rocket-http")
-    (version "0.5.0")
+    (version "0.5.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "rocket_http" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "17iq208zf9rfxdnx8hfjxnn51074cc9li99yjigzwnfhjhv6d89p"))))
+        (base32 "1fc2z0a7zhmf8rh7s1dwdmmkjmq7qiivsi6027v6ac7f41d92x72"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:tests? #f      ; can't find crate for `rocket`
-       #:cargo-inputs (("rust-cookie" ,rust-cookie-0.18)
+     (list
+      #:tests? #f ;can't find crate for `rocket`
+      #:cargo-inputs `(("rust-cookie" ,rust-cookie-0.18)
                        ("rust-either" ,rust-either-1)
                        ("rust-futures" ,rust-futures-0.3)
                        ("rust-http" ,rust-http-0.2)
-- 
2.46.0

[bug#69620] [PATCH rust-team v4 5/5] gnu: rust-rocket and rust-pear: Enable building

[Aaron Covrig via Guix-patches via]

* gnu/packages/crates-io.scm (rust-pear-0.1): Enable building and tests
* gnu/packages/crates-io.scm (rust-pear-codegen-0.1): Enable building
  and tests
* gnu/packages/crates-web.scm (rust-rocket-0.4): Enable building and
  tests
* gnu/packages/crates-web.scm (rust-rocket-codegen-0.4): Enable building
  and tests
* gnu/packages/crates-web.scm (rust-rocket-http-0.4): Enable building
  and tests
---
 gnu/packages/crates-io.scm  |  35 +++++++---
 gnu/packages/crates-web.scm | 126 +++++++++++++++++++++++-------------
 2 files changed, 107 insertions(+), 54 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index dd26496ece..647efce272 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -53088,8 +53088,13 @@ (define-public rust-pear-0.1
        (sha256
         (base32 "02lnp8c414z5ds0lskd4zxlalrjljzpkg8g6kizszij4h52sgprj"))))
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs (("rust-pear-codegen" ,rust-pear-codegen-0.1))))))
+     (list
+      #:cargo-inputs `(("rust-pear-codegen" ,rust-pear-codegen-0.1))
+      #:phases #~(modify-phases %standard-phases
+                   ;; Enable using nightly/dev features
+                   (add-after 'unpack 'enable-unstable-features
+                     (lambda _
+                       (setenv "RUSTC_BOOTSTRAP" "1"))))))))
 
 (define-public rust-pear-codegen-0.2
   (package
@@ -53134,15 +53139,25 @@ (define-public rust-pear-codegen-0.1
        (uri (crate-uri "pear_codegen" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "19lcpkfspizd4ywwvca6rxgc311m070k3ndvwa9vrbw1snjqna60"))))
+        (base32 "19lcpkfspizd4ywwvca6rxgc311m070k3ndvwa9vrbw1snjqna60"))
+       (modules '((guix build utils)))
+       (snippet '(begin
+                   (delete-file "build.rs")))))
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-proc-macro2" ,rust-proc-macro2-0.4)
-        ("rust-quote" ,rust-quote-0.6)
-        ("rust-syn" ,rust-syn-0.15)
-        ("rust-version-check" ,rust-version-check-0.9)
-        ("rust-yansi" ,rust-yansi-0.5))))))
+     (list
+      #:cargo-inputs `(("rust-proc-macro2" ,rust-proc-macro2-0.4)
+                       ("rust-quote" ,rust-quote-0.6)
+                       ("rust-syn" ,rust-syn-0.15)
+                       ;; development inputs here to address build issues
+                       ("rust-version-check" ,rust-version-check-0.9)
+                       ("rust-yansi" ,rust-yansi-0.5))
+      #:cargo-development-inputs `(("rust-version-check" ,rust-version-check-0.9)
+                                   ("rust-yansi" ,rust-yansi-0.5))
+      #:phases #~(modify-phases %standard-phases
+                   ;; Enable using nightly/dev features
+                   (add-after 'unpack 'enable-unstable-features
+                     (lambda _
+                       (setenv "RUSTC_BOOTSTRAP" "1"))))))))
 
 (define-public rust-peeking-take-while-0.1
   (package
diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index 70158c7f60..0c9260ead5 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -4920,31 +4920,50 @@ (define-public rust-rocket-0.4
   (package
     (inherit rust-rocket-0.5)
     (name "rust-rocket")
-    (version "0.4.7")
+    (version "0.4.11")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "rocket" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "04ybnhjw92zaan92lsmx6mkhqc9cpsg3885svb3wzyj39pyzvsvz"))))
+        (base32 "0pimz9v0737dvz487j0kij7kasjyahaxd7ba2bcc3p6513fdkfc3"))
+       (modules '((guix build utils)))
+       (snippet '(begin
+                   ;; enable nightly/dev in build.rs for RUSTC_BOOTSTRAP build
+                   (substitute* "build.rs"
+                     (("if !channel.supports_features")
+                      "/* if !channel.supports_features")
+                     (("if !version.at_least")
+                      "*/ \nif !version.at_least"))
+                   ;; Add missing development dependency (for tests)
+                   (substitute* "Cargo.toml"
+                     (("\\[features\\]" all)
+                      (string-append "[dev-dependencies.lazy_static]" "\n"
+                                     "version = \"1\"" "\n" all))) #t))))
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-atty" ,rust-atty-0.2)
-        ("rust-base64" ,rust-base64-0.12)
-        ("rust-log" ,rust-log-0.4)
-        ("rust-memchr" ,rust-memchr-2)
-        ("rust-num-cpus" ,rust-num-cpus-1)
-        ("rust-pear" ,rust-pear-0.1)
-        ("rust-rocket-codegen" ,rust-rocket-codegen-0.4)
-        ("rust-rocket-http" ,rust-rocket-http-0.4)
-        ("rust-state" ,rust-state-0.4)
-        ("rust-time" ,rust-time-0.1)
-        ("rust-toml" ,rust-toml-0.4)
-        ("rust-version-check" ,rust-version-check-0.9)
-        ("rust-yansi" ,rust-yansi-0.5)
-        ("rust-yansi" ,rust-yansi-0.5))))))
+     (list
+      #:cargo-inputs `(("rust-atty" ,rust-atty-0.2)
+                       ("rust-base64" ,rust-base64-0.12)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-memchr" ,rust-memchr-2)
+                       ("rust-num-cpus" ,rust-num-cpus-1)
+                       ("rust-pear" ,rust-pear-0.1)
+                       ("rust-rocket-codegen" ,rust-rocket-codegen-0.4)
+                       ("rust-rocket-http" ,rust-rocket-http-0.4)
+                       ("rust-state" ,rust-state-0.4)
+                       ("rust-time" ,rust-time-0.1)
+                       ("rust-toml" ,rust-toml-0.4)
+                       ("rust-version-check" ,rust-version-check-0.9)
+                       ("rust-yansi" ,rust-yansi-0.5)
+                       ("rust-yansi" ,rust-yansi-0.5))
+      ;; Adding in missing dev dependency
+      #:cargo-development-inputs `(("rust-lazy-static" ,rust-lazy-static-1))
+      #:phases #~(modify-phases %standard-phases
+                   ;; Enable using nightly/dev features
+                   (add-after 'unpack 'enable-unstable-features
+                     (lambda _
+                       (setenv "RUSTC_BOOTSTRAP" "1"))))))))
 
 (define-public rust-rocket-codegen-0.5
   (package
@@ -4984,24 +5003,38 @@ (define-public rust-rocket-codegen-0.4
   (package
     (inherit rust-rocket-codegen-0.5)
     (name "rust-rocket-codegen")
-    (version "0.4.7")
+    (version "0.4.11")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "rocket_codegen" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "18s2dll8c4sd26s8cfr6cizj5z55xwnk6r6x7b2wvcf8n9ajrb6f"))))
+        (base32 "1zl4f99s4df8fpkps53qn77030baww4x7zflggwql290b1xh6418"))
+       (modules '((guix build utils)))
+       (snippet '(begin
+                   (substitute* "build.rs"
+                     ;; enable nightly/dev in build.rs for RUSTC_BOOTSTRAP build
+                     (("if !channel.supports_features")
+                      "/* if !channel.supports_features")
+                     (("if !version.at_least")
+                      "*/ \nif !version.at_least"))))))
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-devise" ,rust-devise-0.2)
-        ("rust-glob" ,rust-glob-0.3)
-        ("rust-indexmap" ,rust-indexmap-1)
-        ("rust-quote" ,rust-quote-0.6)
-        ("rust-rocket-http" ,rust-rocket-http-0.4)
-        ("rust-version-check" ,rust-version-check-0.9)
-        ("rust-yansi" ,rust-yansi-0.5))))))
+     (list
+      #:tests? #f ;Tests depend on multiple undeclared crates
+      #:cargo-inputs `(("rust-devise" ,rust-devise-0.2)
+                       ("rust-glob" ,rust-glob-0.3)
+                       ("rust-indexmap" ,rust-indexmap-1)
+                       ("rust-quote" ,rust-quote-0.6)
+                       ("rust-rocket-http" ,rust-rocket-http-0.4))
+      #:cargo-development-inputs `(("rust-version-check" ,rust-version-check-0.9)
+                                   ("rust-yansi" ,rust-yansi-0.5)
+                                   ("rust-rocket" ,rust-rocket-0.4)) ;For tests
+      #:phases #~(modify-phases %standard-phases
+                   ;; Enable using nightly/dev features
+                   (add-after 'unpack 'enable-unstable-features
+                     (lambda _
+                       (setenv "RUSTC_BOOTSTRAP" "1"))))))))
 
 (define-public rust-rocket-http-0.5
   (package
@@ -5053,28 +5086,33 @@ (define-public rust-rocket-http-0.4
   (package
     (inherit rust-rocket-http-0.5)
     (name "rust-rocket-http")
-    (version "0.4.7")
+    (version "0.4.11")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "rocket_http" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0ga98nbcga8amg4xhrfkn1wljnqx9h0vv7mnay9g66vsxl042dnf"))))
+        (base32 "17xiivj4cp3anm4rxxpd8g58kzday1y2pgdys2i23wz1538wpy9b"))))
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-cookie" ,rust-cookie-0.11)
-        ("rust-hyper" ,rust-hyper-0.10)
-        ("rust-hyper-sync-rustls" ,rust-hyper-sync-rustls-0.3)
-        ("rust-indexmap" ,rust-indexmap-1)
-        ("rust-pear" ,rust-pear-0.1)
-        ("rust-percent-encoding" ,rust-percent-encoding-1)
-        ("rust-rustls" ,rust-rustls-0.14)
-        ("rust-smallvec" ,rust-smallvec-1)
-        ("rust-state" ,rust-state-0.4)
-        ("rust-time" ,rust-time-0.1)
-        ("rust-unicode-xid" ,rust-unicode-xid-0.1))))))
+     `(#:cargo-test-flags ;doctests depend on undeclared crates
+       '("--lib" "--bins" "--tests" "--release")
+       #:cargo-inputs (("rust-cookie" ,rust-cookie-0.11)
+                       ("rust-hyper" ,rust-hyper-0.10)
+                       ("rust-hyper-sync-rustls" ,rust-hyper-sync-rustls-0.3)
+                       ("rust-indexmap" ,rust-indexmap-1)
+                       ("rust-pear" ,rust-pear-0.1)
+                       ("rust-percent-encoding" ,rust-percent-encoding-1)
+                       ("rust-rustls" ,rust-rustls-0.14)
+                       ("rust-smallvec" ,rust-smallvec-1)
+                       ("rust-state" ,rust-state-0.4)
+                       ("rust-time" ,rust-time-0.1)
+                       ("rust-unicode-xid" ,rust-unicode-xid-0.1))
+       #:phases (modify-phases %standard-phases
+                  ;; Enable using nightly/dev features
+                  (add-after 'unpack 'enable-unstable-features
+                    (lambda _
+                      (setenv "RUSTC_BOOTSTRAP" "1"))))))))
 
 (define-public rust-salvo-0.16
   (package
-- 
2.46.0