gnu: rust-syn: Don't include minor version in variable name.

* gnu/packages/crates-io.scm (rust-syn-1.0): Rename to...
  (rust-syn-1): ...this.
* gnu/packagess/rust-apps.scm (rust-cbindgen): Fixup dependency list.

2 files changed, 44 insertions, 44 deletions

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 26358ff8bd..d8f054b267 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -384,7 +384,7 @@ code that is generic with regard to the algebraic entity types.")
         ("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quickcheck" ,rust-quickcheck-0.9)
         ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1.0))))
+        ("rust-syn" ,rust-syn-1))))
     (home-page "https://github.com/rustsim/alga")
     (synopsis "Dutomatic deriving of abstract algebra traits")
     (description "Derive attribute for implementing algebraic traits from the
@@ -681,7 +681,7 @@ text or blue underlined text, on ANSI terminals.")
     (arguments
      `(#:cargo-inputs
        (("rust-proc-macro2" ,rust-proc-macro2-1)
-        ("rust-syn" ,rust-syn-1.0)
+        ("rust-syn" ,rust-syn-1)
         ("rust-quote" ,rust-quote-1))))
     (home-page "https://github.com/lu-zero/arg_enum_proc_macro")
     (synopsis "Procedural macro compatible with clap arg_enum")
@@ -4789,7 +4789,7 @@ Code} (MAC) algorithms.")
         ("rust-quote" ,rust-quote-1)
         ("rust-serde" ,rust-serde-1)
         ("rust-smallvec" ,rust-smallvec-1)
-        ("rust-syn" ,rust-syn-1.0))
+        ("rust-syn" ,rust-syn-1))
        #:cargo-development-inputs
        (("rust-difference" ,rust-difference-2.0)
         ("rust-encoding-rs" ,rust-encoding-rs-0.8)
@@ -4829,7 +4829,7 @@ Code} (MAC) algorithms.")
         ("rust-autocfg" ,rust-autocfg-0.1)
         ("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1.0))
+        ("rust-syn" ,rust-syn-1))
        #:cargo-development-inputs
        (("rust-difference" ,rust-difference-2.0)
         ("rust-encoding-rs" ,rust-encoding-rs-0.8)
@@ -4852,7 +4852,7 @@ Code} (MAC) algorithms.")
     (arguments
      `(#:cargo-inputs
        (("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1.0))))
+        ("rust-syn" ,rust-syn-1))))
     (home-page "https://github.com/servo/rust-cssparser")
     (synopsis "Procedural macros for cssparser")
     (description
@@ -4879,7 +4879,7 @@ Code} (MAC) algorithms.")
         ("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-procedural-masquerade" ,rust-procedural-masquerade-0.1)
         ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1.0))))))
+        ("rust-syn" ,rust-syn-1))))))
 
 (define-public rust-csv-1.1
   (package
@@ -4995,7 +4995,7 @@ Transparency logs for use with sct crate.")
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-syn" ,rust-syn-1.0)
+       (("rust-syn" ,rust-syn-1)
         ("rust-quote" ,rust-quote-1))
        #:cargo-development-inputs
        (("rust-libc-print" ,rust-libc-print-0.1))))
@@ -5453,7 +5453,7 @@ for arbitrary structs.")
        #:cargo-inputs
        (("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1.0))
+        ("rust-syn" ,rust-syn-1))
        #:cargo-development-inputs
        (("rust-peg" ,rust-peg-0.5)
         ("rust-rustc-version" ,rust-rustc-version-0.2))))
@@ -5488,7 +5488,7 @@ traits for both structs and enums.")
      `(#:cargo-inputs
        (("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1.0))))
+        ("rust-syn" ,rust-syn-1))))
     (home-page "https://github.com/nrc/derive-new")
     (synopsis "Simple constructor functions for structs and enums")
     (description "`#[derive(new)]` implements simple constructor functions for
@@ -6683,7 +6683,7 @@ variables.")
         ("rust-skeptic" ,rust-skeptic-0.13)
         ("rust-proc-macro-error" ,rust-proc-macro-error-0.4)
         ("rust-proc-macro2" ,rust-proc-macro2-1)
-        ("rust-syn" ,rust-syn-1.0)
+        ("rust-syn" ,rust-syn-1)
         ("rust-rustversion" ,rust-rustversion-1.0)
         ("rust-quote" ,rust-quote-1))
        #:cargo-development-inputs
@@ -6977,7 +6977,7 @@ testing.")
        #:cargo-inputs
        (("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1.0)
+        ("rust-syn" ,rust-syn-1)
         ("rust-synstructure" ,rust-synstructure-0.12))
        #:cargo-development-inputs
        (("rust-failure" ,rust-failure-0.1))))
@@ -7472,7 +7472,7 @@ implementation that is more efficient for smaller hash keys.")
      `(#:cargo-inputs
        (("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1.0))))
+        ("rust-syn" ,rust-syn-1))))
     (home-page "https://github.com/sfackler/foreign-types")
     (synopsis "Internal crate used by foreign-types")
     (description
@@ -8175,7 +8175,7 @@ for the futures-rs library.")
        (("rust-proc-macro-hack" ,rust-proc-macro-hack-0.5)
         ("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1.0))))
+        ("rust-syn" ,rust-syn-1))))
     (home-page "https://rust-lang-nursery.github.io/futures-rs")
     (synopsis "Futures-rs procedural macro implementations")
     (description
@@ -11363,7 +11363,7 @@ that works on WASM too.")
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-proc-macro2" ,rust-proc-macro2-1)
-        ("rust-syn" ,rust-syn-1.0)
+        ("rust-syn" ,rust-syn-1)
         ("rust-quote" ,rust-quote-1))))
     (home-page "https://github.com/lu-zero/interpolate_name")
     (synopsis "Simple procedural macro attribute for repetitive tests")
@@ -14562,7 +14562,7 @@ release (fork of debug_unreachable)")
      `(#:cargo-inputs
        (("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1.0))
+        ("rust-syn" ,rust-syn-1))
        #:cargo-development-inputs
        (("rust-tempfile" ,rust-tempfile-3))))
     (home-page "https://github.com/dtolnay/no-panic")
@@ -15049,7 +15049,7 @@ including bigint, complex, rational, range iterators, generic integers, and more
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-proc-macro2" ,rust-proc-macro2-1)
-        ("rust-syn" ,rust-syn-1.0)
+        ("rust-syn" ,rust-syn-1)
         ("rust-quote" ,rust-quote-1))))
     (home-page "https://github.com/rust-num/num-derive")
     (synopsis "Numeric syntax extensions")
@@ -16192,7 +16192,7 @@ normally prevent moving a type that has been borrowed from.")
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-proc-macro2" ,rust-proc-macro2-1)
-        ("rust-syn" ,rust-syn-1.0)
+        ("rust-syn" ,rust-syn-1)
         ("rust-quote" ,rust-quote-1))))
     (home-page "https://github.com/Ogeon/palette")
     (synopsis "Automatically implement traits from the palette crate")
@@ -16738,7 +16738,7 @@ synchronization primitives.")
        (("rust-proc-macro-hack" ,rust-proc-macro-hack-0.5)
         ("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1.0))))
+        ("rust-syn" ,rust-syn-1))))
     (home-page "https://github.com/dtolnay/paste")
     (synopsis "Implementation detail of the paste crate")
     (description
@@ -17111,7 +17111,7 @@ algorithm.")
         ("rust-pest-meta" ,rust-pest-meta-2.1)
         ("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1.0))))
+        ("rust-syn" ,rust-syn-1))))
     (home-page "https://pest.rs/")
     (synopsis "Pest code generator")
     (description "Pest code generator.")
@@ -17378,7 +17378,7 @@ function data structures.")
         ("rust-phf-generator" ,rust-phf-generator-0.8)
         ("rust-phf-shared" ,rust-phf-shared-0.8)
         ("rust-proc-macro2" ,rust-proc-macro2-1)
-        ("rust-syn" ,rust-syn-1.0)
+        ("rust-syn" ,rust-syn-1)
         ("rust-quote" ,rust-quote-1))))
     (home-page "https://github.com/sfackler/rust-phf")
     (synopsis "Macros to generate types in the phf crate")
@@ -18472,7 +18472,7 @@ formatted tables in terminal.")
         (("rust-proc-macro-error-attr" ,rust-proc-macro-error-attr-0.4)
          ("rust-version-check" ,rust-version-check-0.9)
          ("rust-proc-macro2" ,rust-proc-macro2-1)
-         ("rust-syn" ,rust-syn-1.0)
+         ("rust-syn" ,rust-syn-1)
          ("rust-quote" ,rust-quote-1))))
     (home-page "https://gitlab.com/CreepySkeleton/proc-macro-error")
     (synopsis "Almost drop-in replacement to panics in proc-macros")
@@ -18500,7 +18500,7 @@ formatted tables in terminal.")
        (("rust-syn-mid" ,rust-syn-mid-0.5)
         ("rust-version-check" ,rust-version-check-0.9)
         ("rust-proc-macro2" ,rust-proc-macro2-1)
-        ("rust-syn" ,rust-syn-1.0)
+        ("rust-syn" ,rust-syn-1)
         ("rust-quote" ,rust-quote-1))))
     (home-page "https://gitlab.com/CreepySkeleton/proc-macro-error")
     (synopsis "Attribute macro for proc-macro-error crate")
@@ -18526,7 +18526,7 @@ formatted tables in terminal.")
      `(#:cargo-development-inputs
        (("rust-quote" ,rust-quote-1)
         ("rust-rustversion" ,rust-rustversion-1.0)
-        ("rust-syn" ,rust-syn-1.0)
+        ("rust-syn" ,rust-syn-1)
         ("rust-trybuild" ,rust-trybuild-1.0)
         ("rust-demo-hack" ,rust-demo-hack-0.0)
         ("rust-demo-hack-impl" ,rust-demo-hack-impl-0.0))))
@@ -20326,7 +20326,7 @@ functionality.")
      `(#:cargo-inputs
        (("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1.0))))
+        ("rust-syn" ,rust-syn-1))))
     (home-page "https://github.com/dtolnay/ref-cast")
     (synopsis "Derive implementation for @code{ref_cast::RefCast}")
     (description
@@ -21272,7 +21272,7 @@ It is automatically published using the compiler repository at
        #:cargo-inputs
        (("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1.0)
+        ("rust-syn" ,rust-syn-1)
         ("rust-synstructure" ,rust-synstructure-0.12))))
     (home-page "https://github.com/alexcrichton/rustc-auto-publish")
     (synopsis "Automatically published versions of rustc macros")
@@ -21869,7 +21869,7 @@ font rendering.")
      `(#:cargo-inputs
        (("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1.0))))
+        ("rust-syn" ,rust-syn-1))))
     (home-page "https://github.com/dtolnay/rustversion")
     (synopsis "Conditional compilation according to rustc compiler version")
     (description
@@ -21895,7 +21895,7 @@ font rendering.")
      `(#:cargo-inputs
        (("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1.0))))
+        ("rust-syn" ,rust-syn-1))))
     (home-page "https://github.com/dtolnay/rustversion")
     (synopsis "Conditional compilation according to rustc compiler version")
     (description "This package provides conditional compilation according to
@@ -22305,7 +22305,7 @@ endian-aware Read/Write traits for byte buffers.")
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-proc-macro2" ,rust-proc-macro2-1)
-        ("rust-syn" ,rust-syn-1.0)
+        ("rust-syn" ,rust-syn-1)
         ("rust-quote" ,rust-quote-1))))
     (home-page "https://github.com/m4b/scroll")
     (synopsis "Pread and Pwrite traits from the scroll crate")
@@ -22886,7 +22886,7 @@ for the serde framework.")
        #:cargo-inputs
        (("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1.0))
+        ("rust-syn" ,rust-syn-1))
        #:cargo-development-inputs
        (("rust-serde" ,rust-serde-1))))
     (home-page "https://serde.rs")
@@ -24451,7 +24451,7 @@ Web.")
         ("rust-quote" ,rust-quote-1)
         ("rust-serde" ,rust-serde-1)
         ("rust-serde-derive" ,rust-serde-derive-1)
-        ("rust-syn" ,rust-syn-1.0))))
+        ("rust-syn" ,rust-syn-1))))
     (home-page "https://github.com/koute/stdweb")
     (synopsis "Derive macros for the stdweb crate")
     (description
@@ -24482,7 +24482,7 @@ you to define custom reference types outside of the @code{stdweb} library.")
         ("rust-serde-derive" ,rust-serde-derive-1)
         ("rust-serde-json" ,rust-serde-json-1)
         ("rust-sha1" ,rust-sha1-0.6)
-        ("rust-syn" ,rust-syn-1.0))))
+        ("rust-syn" ,rust-syn-1))))
     (home-page "https://github.com/koute/stdweb")
     (synopsis "Internal procedural macros for the stdweb crate")
     (description
@@ -24858,7 +24858,7 @@ and Jaro-Winkler.")
        (("rust-heck" ,rust-heck-0.3)
         ("rust-proc-macro-error" ,rust-proc-macro-error-0.4)
         ("rust-proc-macro2" ,rust-proc-macro2-1)
-        ("rust-syn" ,rust-syn-1.0)
+        ("rust-syn" ,rust-syn-1)
         ("rust-quote" ,rust-quote-1))))
     (home-page "https://github.com/TeXitoi/structopt")
     (synopsis "Parse command line argument by defining a struct, derive crate")
@@ -24973,14 +24973,14 @@ cryptographic implementations.")
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-proc-macro2" ,rust-proc-macro2-1)
-        ("rust-syn" ,rust-syn-1.0)
+        ("rust-syn" ,rust-syn-1)
         ("rust-quote" ,rust-quote-1))))
     (home-page "https://github.com/sval-rs/sval")
     (synopsis "Custom derive for sval")
     (description "Custom derive for sval.")
     (license (list license:asl2.0 license:expat))))
 
-(define-public rust-syn-1.0
+(define-public rust-syn-1
   (package
     (name "rust-syn")
     (version "1.0.17")
@@ -25017,7 +25017,7 @@ cryptographic implementations.")
 
 (define-public rust-syn-0.15
   (package
-    (inherit rust-syn-1.0)
+    (inherit rust-syn-1)
     (name "rust-syn")
     (version "0.15.44")
     (source
@@ -25094,7 +25094,7 @@ cryptographic implementations.")
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-proc-macro2" ,rust-proc-macro2-1)
-        ("rust-syn" ,rust-syn-1.0)
+        ("rust-syn" ,rust-syn-1)
         ("rust-quote" ,rust-quote-1))))
     (home-page "https://github.com/taiki-e/syn-mid")
     (synopsis
@@ -25155,7 +25155,7 @@ cryptographic implementations.")
        #:cargo-inputs
        (("rust-unicode-xid" ,rust-unicode-xid-0.2)
         ("rust-proc-macro2" ,rust-proc-macro2-1)
-        ("rust-syn" ,rust-syn-1.0)
+        ("rust-syn" ,rust-syn-1)
         ("rust-quote" ,rust-quote-1))))
     (home-page "https://github.com/mystor/synstructure")
     (synopsis "Helper methods and macros for custom derives")
@@ -26060,7 +26060,7 @@ handle Unicode characters correctly.")
        #:cargo-inputs
        (("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1.0))))
+        ("rust-syn" ,rust-syn-1))))
     (home-page "https://github.com/dtolnay/thiserror")
     (synopsis "Implementation detail of the thiserror crate")
     (description "This package provides an implementation detail of the
@@ -26683,7 +26683,7 @@ futures efficiently")
        #:cargo-inputs
        (("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1.0))
+        ("rust-syn" ,rust-syn-1))
        #:cargo-development-inputs
        (("rust-tokio" ,rust-tokio-0.2))))
     (home-page "https://tokio.rs")
@@ -28633,7 +28633,7 @@ in Rust.")
         ("rust-log" ,rust-log-0.4)
         ("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1.0)
+        ("rust-syn" ,rust-syn-1)
         ("rust-wasm-bindgen-shared" ,rust-wasm-bindgen-shared-0.2))))
     (home-page "https://rustwasm.github.io/wasm-bindgen/")
     (synopsis "Backend code generation of the wasm-bindgen tool")
@@ -28747,7 +28747,7 @@ dependency.")
      `(#:cargo-inputs
        (("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1.0)
+        ("rust-syn" ,rust-syn-1)
         ("rust-wasm-bindgen-backend" ,rust-wasm-bindgen-backend-0.2)
         ("rust-wasm-bindgen-shared" ,rust-wasm-bindgen-shared-0.2))))
     (home-page "https://rustwasm.github.io/wasm-bindgen/")
@@ -28943,7 +28943,7 @@ attribute that is not in the shared backend crate.")
         ("rust-log" ,rust-log-0.4)
         ("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1.0)
+        ("rust-syn" ,rust-syn-1)
         ("rust-wasm-bindgen-backend" ,rust-wasm-bindgen-backend-0.2)
         ("rust-weedle" ,rust-weedle-0.10))))
     (home-page "https://rustwasm.github.io/wasm-bindgen/")
@@ -30184,7 +30184,7 @@ implementation that works everywhere, even WASM!")
      `(#:cargo-inputs
        (("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1.0)
+        ("rust-syn" ,rust-syn-1)
         ("rust-synstructure" ,rust-synstructure-0.12))))
     (home-page "https://github.com/iqlusioninc/crates/")
     (synopsis "Custom derive support for zeroize")
diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index 20512a90fe..829e679e96 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -283,7 +283,7 @@ gitignore rules.")
         ("quote" ,rust-quote-1)
         ("serde" ,rust-serde-1)
         ("serde-json" ,rust-serde-json-1)
-        ("syn" ,rust-syn-1.0)
+        ("syn" ,rust-syn-1)
         ("tempfile" ,rust-tempfile-3)
         ("toml" ,rust-toml-0.5))))
     (home-page "https://github.com/eqrion/cbindgen/")