enum-primitive-derive: Update to 0.2.2

diff --git a/src/enum-primitive-derive/debian/changelog b/src/enum-primitive-derive/debian/changelog
index fd854dd5aafc644da6790d795430c94f8d90518f..1da6334158b87dfb4bf702abf26917d7a4358ca2 100644 (file)
--- a/src/enum-primitive-derive/debian/changelog
+++ b/src/enum-primitive-derive/debian/changelog
@@ -1,3 +1,10 @@
+rust-enum-primitive-derive (0.2.2-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Team upload.
+  * Package enum-primitive-derive 0.2.2 from crates.io using debcargo 2.5.0
+
+ -- James McCoy <jamessan@debian.org>  Tue, 22 Feb 2022 21:10:06 -0500
+
 rust-enum-primitive-derive (0.1.2-2) unstable; urgency=medium
 
   * Team upload.

diff --git a/src/enum-primitive-derive/debian/copyright.debcargo.hint b/src/enum-primitive-derive/debian/copyright.debcargo.hint
index 5b8bb9f4bb1e3fe6baa8edcf7f99ccfeaa5a824e..59ae91e2a8ab69a40e336bc484418e56f0ef78e8 100644 (file)
--- a/src/enum-primitive-derive/debian/copyright.debcargo.hint
+++ b/src/enum-primitive-derive/debian/copyright.debcargo.hint
@@ -28,8 +28,8 @@ Comment:
 
 Files: debian/*
 Copyright:
- 2019-2020 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
- 2019-2020 kpcyrd <git@rxv.cc>
+ 2019-2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2019-2022 kpcyrd <git@rxv.cc>
 License: MIT
 
 License: MIT

diff --git a/src/enum-primitive-derive/debian/patches/relax-deps.patch b/src/enum-primitive-derive/debian/patches/relax-deps.patch
deleted file mode 100644 (file)
index 6ee96f3..0000000
--- a/src/enum-primitive-derive/debian/patches/relax-deps.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -25,12 +25,12 @@
- [lib]
- proc-macro = true
- [dependencies.num-traits]
--version = "^0.1"
-+version = "^0.2"
- 
- [dependencies.quote]
--version = "^0.3"
-+version = "^1.0"
- 
- [dependencies.syn]
--version = "^0.11"
-+version = "^1.0"
- [badges.gitlab]
- repository = "cardoe/enum-primitive-derive"

diff --git a/src/enum-primitive-derive/debian/patches/series b/src/enum-primitive-derive/debian/patches/series
deleted file mode 100644 (file)
index 126c443..0000000
--- a/src/enum-primitive-derive/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-relax-deps.patch
-syn-1.0.patch

diff --git a/src/enum-primitive-derive/debian/patches/syn-1.0.patch b/src/enum-primitive-derive/debian/patches/syn-1.0.patch
deleted file mode 100644 (file)
index 5ac73b0..0000000
--- a/src/enum-primitive-derive/debian/patches/syn-1.0.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From f9b8d46c4588ea0d60ba04ba2447cbae695ad67e Mon Sep 17 00:00:00 2001
-From: "Chris West (Faux)" <git@goeswhere.com>
-Date: Sun, 16 Jun 2019 16:09:46 +0100
-Subject: [PATCH 2/2] upgrade syn/quote
-
----
- Cargo.toml |  4 ++--
- src/lib.rs | 35 ++++++++++++++---------------------
- 2 files changed, 16 insertions(+), 23 deletions(-)
-
-diff --git a/src/lib.rs b/src/lib.rs
-index 3a1fcc6..3b5c0d4 100644
---- a/src/lib.rs
-+++ b/src/lib.rs
-@@ -89,6 +89,7 @@ extern crate proc_macro;
- extern crate num_traits;
- #[macro_use]
- extern crate quote;
-+#[macro_use]
- extern crate syn;
- 
- use proc_macro::TokenStream;
-@@ -97,43 +98,35 @@ use proc_macro::TokenStream;
- /// `num_traits::FromPrimitive`
- #[proc_macro_derive(Primitive)]
- pub fn primitive(input: TokenStream) -> TokenStream {
--    // Construct a string representation of the type definition
--    let s = input.to_string();
--
--    // Parse the string representation
--    let ast = syn::parse_derive_input(&s).unwrap();
--
--    // Build the impl
--    let gen = impl_primitive(&ast);
--
--    // Return the generated impl
--    gen.parse().unwrap()
-+    let ast = parse_macro_input!(input as syn::DeriveInput);
-+    impl_primitive(&ast)
- }
- 
--fn impl_primitive(ast: &syn::DeriveInput) -> quote::Tokens {
-+fn impl_primitive(ast: &syn::DeriveInput) -> TokenStream {
-     let name = &ast.ident;
- 
-     // Check if derive(Primitive) was specified for a struct
--    if let syn::Body::Enum(ref variant) = ast.body {
-+    if let syn::Data::Enum(ref variant) = ast.data {
- 
--        let (var_u64, dis_u64): (Vec<_>, Vec<_>) = variant.iter().map(|v| {
--            if v.data != syn::VariantData::Unit {
--                panic!("#[derive(Primitive) can only operate on C-like enums");
-+        let (var_u64, dis_u64): (Vec<_>, Vec<_>) = variant.variants.iter().map(|v| {
-+            match v.fields {
-+                syn::Fields::Unit => (),
-+                _ => panic!("#[derive(Primitive) can only operate on C-like enums"),
-             }
-             if v.discriminant.is_none() {
-                 panic!("#[derive(Primitive) requires C-like enums with \
-                        discriminants for all enum variants");
-             }
- 
--            let discrim = match v.discriminant.clone().unwrap() {
--                syn::ConstExpr::Cast(real, _) => *real,
-+            let discrim = match v.discriminant.clone().map(|(_eq, expr)| expr).unwrap() {
-+                syn::Expr::Cast(real) => *real.expr,
-                 orig => orig,
-             };
-             (v.ident.clone(), discrim)
-         }).unzip();
- 
-         // quote!{} needs this to be a vec since its in #( )*
--        let enum_u64 = vec![name.clone(); variant.len()];
-+        let enum_u64 = vec![name.clone(); variant.variants.len()];
- 
-         // can't reuse variables in quote!{} body
-         let var_i64 = var_u64.clone();
-@@ -149,7 +142,7 @@ fn impl_primitive(ast: &syn::DeriveInput) -> quote::Tokens {
-         let to_var_i64 = var_u64.clone();
-         let to_dis_i64 = dis_u64.clone();
- 
--        quote! {
-+        TokenStream::from(quote! {
-             impl ::num_traits::FromPrimitive for #name {
-                 fn from_u64(val: u64) -> Option<Self> {
-                     match val as _ {
-@@ -179,7 +172,7 @@ fn impl_primitive(ast: &syn::DeriveInput) -> quote::Tokens {
-                     }
-                 }
-             }
--        }
-+        })
-     } else {
-         panic!("#[derive(Primitive)] is only valid for C-like enums");
-     }
--- 
-2.24.1
-