11/19: gnu: Remove rust-regex-1.1.

[guix-commits]

efraim pushed a commit to branch master
in repository guix.

commit 9c13497df45521cd0b30a2e21fce3599b114aafd
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Mon Jun 22 10:28:05 2020 +0300

    gnu: Remove rust-regex-1.1.
    
    * gnu/packages/crates-io.scm (rust-regex-1.1): Remove variable.
    (rust-bindgen-0.50, rust-bindgen-0.49, rust-clap-2,
    rust-compiletest-rs-0.2, rust-console-0.7, rust-docopt-1.1,
    rust-env-logger-0.7, rust-env-logger-0.6, rust-env-logger-0.5,
    rust-gimli-0.18, rust-globset-0.4, rust-grep-cli-0.1,
    rust-grep-matcher-0.1, rust-grep-regex-0.1, rust-grep-searcher-0.1,
    rust-ignore-0.4, rust-nom-5, rust-nom-4.2, rust-once-cell-1.2,
    rust-proptest-0.9, rust-proptest-0.8, rust-pulldown-cmark-0.4,
    rust-regex-automata-0.1, rust-rusqlite-0.19, rust-syn-0.15,
    rust-ucd-parse-0.1, rust-version-sync-0.8) [arguments]: Replace
    rust-regex-1.1 with 1.3.
    * gnu/packages/rust-apps.scm (ripgrep)[arguments]: Same.
---
 gnu/packages/crates-io.scm | 81 ++++++++++++++++------------------------------
 gnu/packages/rust-apps.scm |  2 +-
 2 files changed, 28 insertions(+), 55 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 8161ee9..af0d01f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -1427,7 +1427,7 @@ that uses Serde for transforming structs into bytes and 
vice versa!")
         ("rust-peeking-take-while" ,rust-peeking-take-while-0.1)
         ("rust-proc-macro2" ,rust-proc-macro2-0.4)
         ("rust-quote" ,rust-quote-0.6)
-        ("rust-regex" ,rust-regex-1.1)
+        ("rust-regex" ,rust-regex-1.3)
         ("rust-shlex" ,rust-shlex-0.1)
         ("rust-which" ,rust-which-2.0))
        #:cargo-development-inputs
@@ -1496,7 +1496,7 @@ that uses Serde for transforming structs into bytes and 
vice versa!")
         ("rust-peeking-take-while" ,rust-peeking-take-while-0.1)
         ("rust-proc-macro2" ,rust-proc-macro2-0.4)
         ("rust-quote" ,rust-quote-0.6)
-        ("rust-regex" ,rust-regex-1.1)
+        ("rust-regex" ,rust-regex-1.3)
         ("rust-shlex" ,rust-shlex-0.1)
         ("rust-which" ,rust-which-2.0))
        #:cargo-development-inputs
@@ -3105,7 +3105,7 @@ for computer graphics.")
         ("rust-yaml-rust" ,rust-yaml-rust-0.3))
        #:cargo-development-inputs
        (("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-regex" ,rust-regex-1.1)
+        ("rust-regex" ,rust-regex-1.3)
         ("rust-version-sync" ,rust-version-sync-0.8))))
     (home-page "https://clap.rs/";)
     (synopsis "Command Line Argument Parser")
@@ -3447,7 +3447,7 @@ need compiler-rt intrinsics.")
         ("rust-libc" ,rust-libc-0.2)
         ("rust-log" ,rust-log-0.4)
         ("rust-miow" ,rust-miow-0.3)
-        ("rust-regex" ,rust-regex-1.1)
+        ("rust-regex" ,rust-regex-1.3)
         ("rust-rustfix" ,rust-rustfix-0.4)
         ("rust-serde" ,rust-serde-1.0)
         ("rust-serde-derive" ,rust-serde-derive-1.0)
@@ -3536,7 +3536,7 @@ harness.")
         ("rust-lazy-static" ,rust-lazy-static-1)
         ("rust-libc" ,rust-libc-0.2)
         ("rust-parking-lot" ,rust-parking-lot-0.8)
-        ("rust-regex" ,rust-regex-1.1)
+        ("rust-regex" ,rust-regex-1.3)
         ("rust-termios" ,rust-termios-0.3)
         ("rust-unicode-width" ,rust-unicode-width-0.1)
         ("rust-winapi" ,rust-winapi-0.3))))
@@ -5339,7 +5339,7 @@ from macros.")
     (arguments
      `(#:cargo-inputs
        (("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-regex" ,rust-regex-1.1)
+        ("rust-regex" ,rust-regex-1.3)
         ("rust-serde" ,rust-serde-1.0)
         ("rust-strsim" ,rust-strsim-0.9))))
     (home-page "https://github.com/docopt/docopt.rs";)
@@ -5977,7 +5977,7 @@ Standard.")
        (("rust-atty" ,rust-atty-0.2)
         ("rust-humantime" ,rust-humantime-1.3)
         ("rust-log" ,rust-log-0.4)
-        ("rust-regex" ,rust-regex-1.1)
+        ("rust-regex" ,rust-regex-1.3)
         ("rust-termcolor" ,rust-termcolor-1.0))))
     (home-page "https://github.com/sebasmagri/env_logger/";)
     (synopsis "Logging implementation for @code{log}")
@@ -6006,7 +6006,7 @@ is configured via an environment variable.")
        (("rust-atty" ,rust-atty-0.2)
         ("rust-humantime" ,rust-humantime-1.2)
         ("rust-log" ,rust-log-0.4)
-        ("rust-regex" ,rust-regex-1.1)
+        ("rust-regex" ,rust-regex-1.3)
         ("rust-termcolor" ,rust-termcolor-1.0))))))
 
 (define-public rust-env-logger-0.5
@@ -6029,7 +6029,7 @@ is configured via an environment variable.")
        (("rust-atty" ,rust-atty-0.2)
         ("rust-humantime" ,rust-humantime-1.2)
         ("rust-log" ,rust-log-0.4)
-        ("rust-regex" ,rust-regex-1.1)
+        ("rust-regex" ,rust-regex-1.3)
         ("rust-termcolor" ,rust-termcolor-1.0))))))
 
 (define-public rust-env-logger-0.4
@@ -8350,7 +8350,7 @@ retrieving random data from system source.")
         ("rust-num-cpus" ,rust-num-cpus-1.10)
         ("rust-object" ,rust-object-0.12)
         ("rust-rayon" ,rust-rayon-1.1)
-        ("rust-regex" ,rust-regex-1.1)
+        ("rust-regex" ,rust-regex-1.3)
         ("rust-test-assembler" ,rust-test-assembler-0.1)
         ("rust-typed-arena" ,rust-typed-arena-1.4))))
     (home-page "https://github.com/gimli-rs/gimli";)
@@ -8837,7 +8837,7 @@ shell style patterns.")
         ("rust-bstr" ,rust-bstr-0.2)
         ("rust-fnv" ,rust-fnv-1.0)
         ("rust-log" ,rust-log-0.4)
-        ("rust-regex" ,rust-regex-1.1))
+        ("rust-regex" ,rust-regex-1.3))
        #:cargo-development-inputs
        (("rust-glob" ,rust-glob-0.3))))
     (home-page
@@ -9195,7 +9195,7 @@ loading crate.")
         ("rust-globset" ,rust-globset-0.4)
         ("rust-lazy-static" ,rust-lazy-static-1)
         ("rust-log" ,rust-log-0.4)
-        ("rust-regex" ,rust-regex-1.1)
+        ("rust-regex" ,rust-regex-1.3)
         ("rust-same-file" ,rust-same-file-1.0)
         ("rust-termcolor" ,rust-termcolor-1.0)
         ("rust-winapi-util" ,rust-winapi-util-0.1))))
@@ -9225,7 +9225,7 @@ loading crate.")
      `(#:cargo-inputs
        (("rust-memchr" ,rust-memchr-2.2))
        #:cargo-development-inputs
-       (("rust-regex" ,rust-regex-1.1))))
+       (("rust-regex" ,rust-regex-1.3))))
     (home-page "https://github.com/BurntSushi/ripgrep";)
     (synopsis "Trait for regular expressions")
     (description
@@ -9314,7 +9314,7 @@ standard printing of search results, similar to grep 
itself.")
        (("rust-aho-corasick" ,rust-aho-corasick-0.7)
         ("rust-grep-matcher" ,rust-grep-matcher-0.1)
         ("rust-log" ,rust-log-0.4)
-        ("rust-regex" ,rust-regex-1.1)
+        ("rust-regex" ,rust-regex-1.3)
         ("rust-regex-syntax" ,rust-regex-syntax-0.6)
         ("rust-thread-local" ,rust-thread-local-0.3)
         ("rust-utf8-ranges" ,rust-utf8-ranges-1.0))))
@@ -9350,7 +9350,7 @@ standard printing of search results, similar to grep 
itself.")
         ("rust-memmap" ,rust-memmap-0.7))
        #:cargo-development-inputs
        (("rust-grep-regex" ,rust-grep-regex-0.1)
-        ("rust-regex" ,rust-regex-1.1))))
+        ("rust-regex" ,rust-regex-1.3))))
     (home-page "https://github.com/BurntSushi/ripgrep";)
     (synopsis "Line oriented regex searching as a library")
     (description
@@ -10207,7 +10207,7 @@ SystemTime}}.")
         ("rust-lazy-static" ,rust-lazy-static-1)
         ("rust-log" ,rust-log-0.4)
         ("rust-memchr" ,rust-memchr-2.2)
-        ("rust-regex" ,rust-regex-1.1)
+        ("rust-regex" ,rust-regex-1.3)
         ("rust-same-file" ,rust-same-file-1.0)
         ("rust-thread-local" ,rust-thread-local-1.0)
         ("rust-walkdir" ,rust-walkdir-2.2)
@@ -13588,7 +13588,7 @@ implementation (which is unstable / requires nightly).")
        (("rust-lazy-static" ,rust-lazy-static-1)
         ("rust-lexical-core" ,rust-lexical-core-0.7)
         ("rust-memchr" ,rust-memchr-2.2)
-        ("rust-regex" ,rust-regex-1.1)
+        ("rust-regex" ,rust-regex-1.3)
         ("rust-version-check" ,rust-version-check-0.9))
        #:cargo-development-inputs
        (("rust-criterion" ,rust-criterion-0.2)
@@ -13631,7 +13631,7 @@ combinators library.")
        #:cargo-inputs
        (("rust-lazy-static" ,rust-lazy-static-1)
         ("rust-memchr" ,rust-memchr-2.2)
-        ("rust-regex" ,rust-regex-1.1)
+        ("rust-regex" ,rust-regex-1.3)
         ("rust-version-check" ,rust-version-check-0.1))
        #:cargo-development-inputs
        (("rust-criterion" ,rust-criterion-0.2)
@@ -14493,7 +14493,7 @@ You probably don't want to link to this crate directly; 
instead check out the
        #:cargo-development-inputs
        (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.6)
         ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-regex" ,rust-regex-1.1))))
+        ("rust-regex" ,rust-regex-1.3))))
     (home-page "https://github.com/matklad/once_cell";)
     (synopsis "Single assignment cells and lazy values")
     (description
@@ -17196,7 +17196,7 @@ macro use case.")
         ("rust-rusty-fork" ,rust-rusty-fork-0.2)
         ("rust-tempfile" ,rust-tempfile-3))
        #:cargo-development-inputs
-       (("rust-regex" ,rust-regex-1.1))))
+       (("rust-regex" ,rust-regex-1.3))))
     (home-page
      "https://altsysrq.github.io/proptest-book/proptest/index.html";)
     (synopsis
@@ -17234,7 +17234,7 @@ macro use case.")
         ("rust-rusty-fork" ,rust-rusty-fork-0.2)
         ("rust-tempfile" ,rust-tempfile-3))
        #:cargo-development-inputs
-       (("rust-regex" ,rust-regex-1.1))))))
+       (("rust-regex" ,rust-regex-1.3))))))
 
 (define-public rust-proptest-0.7
   (package
@@ -17312,7 +17312,7 @@ stack pointer and inspect the properties of the stack.")
        (("rust-criterion" ,rust-criterion-0.2)
         ("rust-html5ever" ,rust-html5ever-0.23)
         ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-regex" ,rust-regex-1.1)
+        ("rust-regex" ,rust-regex-1.3)
         ("rust-tendril" ,rust-tendril-0.4))))
     (home-page "https://github.com/raphlinus/pulldown-cmark";)
     (synopsis "Pull parser for CommonMark")
@@ -18837,33 +18837,6 @@ functionality.")
 uses finite automata and guarantees linear time matching on all inputs.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-regex-1.1
-  (package
-    (inherit rust-regex-1.3)
-    (name "rust-regex")
-    (version "1.1.9")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "regex" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "1ba47ivq8l1yikiwikjnq5barag6iqfgcpxlz2263fqbq9y2kn6r"))))
-    (arguments
-     `(#:cargo-inputs
-       (("rust-aho-corasick" ,rust-aho-corasick-0.7)
-        ("rust-memchr" ,rust-memchr-2.2)
-        ("rust-regex-syntax" ,rust-regex-syntax-0.6)
-        ("rust-thread-local" ,rust-thread-local-0.3)
-        ("rust-utf8-ranges" ,rust-utf8-ranges-1.0))
-       #:cargo-development-inputs
-       (("rust-doc-comment" ,rust-doc-comment-0.3)
-        ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-quickcheck" ,rust-quickcheck-0.8)
-        ("rust-rand" ,rust-rand-0.6))))))
-
 (define-public rust-regex-0.2
   (package
     (inherit rust-regex-1.3)
@@ -18943,7 +18916,7 @@ uses finite automata and guarantees linear time 
matching on all inputs.")
        #:cargo-development-inputs
        (("rust-bstr" ,rust-bstr-0.2)
         ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-regex" ,rust-regex-1.1)
+        ("rust-regex" ,rust-regex-1.3)
         ("rust-serde" ,rust-serde-1.0)
         ("rust-serde-bytes" ,rust-serde-bytes-0.11)
         ("rust-serde-derive" ,rust-serde-derive-1.0)
@@ -19269,7 +19242,7 @@ console applications.")
         ("rust-uuid" ,rust-uuid-0.7))
        #:cargo-development-inputs
        (("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-regex" ,rust-regex-1.1)
+        ("rust-regex" ,rust-regex-1.3)
         ("rust-tempdir" ,rust-tempdir-0.3)
         ("rust-unicase" ,rust-unicase-2.4)
         ("rust-uuid" ,rust-uuid-0.7))))
@@ -22786,7 +22759,7 @@ cryptographic implementations.")
        (("rust-insta" ,rust-insta-0.8)
         ("rust-rayon" ,rust-rayon-1.1)
         ("rust-ref-cast" ,rust-ref-cast-0.2)
-        ("rust-regex" ,rust-regex-1.1)
+        ("rust-regex" ,rust-regex-1.3)
         ("rust-termcolor" ,rust-termcolor-1.0)
         ("rust-walkdir" ,rust-walkdir-2.2))))
     (properties '())))
@@ -25105,7 +25078,7 @@ implementation is incomplete.")
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-regex" ,rust-regex-1.1))))
+        ("rust-regex" ,rust-regex-1.3))))
     (home-page "https://github.com/BurntSushi/ucd-generate";)
     (synopsis "Parse data files in the Unicode character database")
     (description
@@ -25994,7 +25967,7 @@ If that fails, no determination is made, and calls 
return None.")
        (("rust-itertools" ,rust-itertools-0.8)
         ("rust-proc-macro2" ,rust-proc-macro2-0.4)
         ("rust-pulldown-cmark" ,rust-pulldown-cmark-0.4)
-        ("rust-regex" ,rust-regex-1.1)
+        ("rust-regex" ,rust-regex-1.3)
         ("rust-semver-parser" ,rust-semver-parser-0.9)
         ("rust-syn" ,rust-syn-0.15)
         ("rust-toml" ,rust-toml-0.5)
diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index a963102..94cb0cf 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -225,7 +225,7 @@ provides defaults for 80% of the use cases.")
         ("rust-lazy-static" ,rust-lazy-static-1)
         ("rust-log" ,rust-log-0.4)
         ("rust-num-cpus" ,rust-num-cpus-1.10)
-        ("rust-regex" ,rust-regex-1.1)
+        ("rust-regex" ,rust-regex-1.3)
         ("rust-serde-json" ,rust-serde-json-1.0)
         ("rust-termcolor" ,rust-termcolor-1.0))
        #:cargo-development-inputs