commit df60d5fd9c77f088c4b7f00ad7d25340252e81a3
author Eh2406 <YeomanYaacov@gmail.com> Sun Oct 25 14:22:53 2015
committer Eh2406 <YeomanYaacov@gmail.com> Sun Oct 25 14:22:53 2015
tree 9a9b71c79cd2f98e5015e5820265f887a3d774ea
parent c9a461a29e97f37a30d382eab6cefd9cdd4f3fa8

use STRUCT! ware it is simple

used regexp to go from:

#\[repr\(C\)\]\s*#\[derive\((Clone|Copy|Debug),\s*(Clone|Copy|Debug),\s*(Clone|Copy|Debug)\)\]\s*\r\npub
struct (.+)\s*{([^}]+)
to:
STRUCT!{struct $4{$5}

then repeatedly form:
STRUCT!{struct (.+) {([^}]+)    pub
to:
STRUCT!{struct $1 {$2

then cleaned up water didn't compile, mostly by reverting.

src/winsmcrd.rs

diff --git a/src/winsmcrd.rs b/src/winsmcrd.rs
index 779f0c4..28f3474 100644
--- a/src/winsmcrd.rs
+++ b/src/winsmcrd.rs
@@ -112,37 +112,33 @@
 pub const SCARD_POWERED: ::ULONG = 4;
 pub const SCARD_NEGOTIABLE: ::ULONG = 5;
 pub const SCARD_SPECIFIC: ::ULONG = 6;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct SCARD_IO_REQUEST {
-    pub dwProtocol: ::DWORD,
-    pub cbPciLength: ::DWORD,
-}
+STRUCT!{struct SCARD_IO_REQUEST {
+    dwProtocol: ::DWORD,
+    cbPciLength: ::DWORD,
+}}
 pub type PSCARD_IO_REQUEST = *mut SCARD_IO_REQUEST;
 pub type LPSCARD_IO_REQUEST = *mut SCARD_IO_REQUEST;
 pub type LPCSCARD_IO_REQUEST = *const SCARD_IO_REQUEST;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct SCARD_T0_COMMAND {
-    pub bCla: ::BYTE,
-    pub bIns: ::BYTE,
-    pub bP1: ::BYTE,
-    pub bP2: ::BYTE,
-    pub bP3: ::BYTE,
-}
+STRUCT!{struct SCARD_T0_COMMAND {
+    bCla: ::BYTE,
+    bIns: ::BYTE,
+    bP1: ::BYTE,
+    bP2: ::BYTE,
+    bP3: ::BYTE,
+}}
 pub type LPSCARD_T0_COMMAND = *mut SCARD_T0_COMMAND;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct SCARD_T0_REQUEST {
-    pub ioRequest: SCARD_IO_REQUEST,
-    pub bSw1: ::BYTE,
-    pub bSw2: ::BYTE,
-    pub CmdBytes: SCARD_T0_COMMAND,
-}
+STRUCT!{struct SCARD_T0_REQUEST {
+    ioRequest: SCARD_IO_REQUEST,
+    bSw1: ::BYTE,
+    bSw2: ::BYTE,
+    CmdBytes: SCARD_T0_COMMAND,
+}}
 UNION!(SCARD_T0_REQUEST, CmdBytes, rgbHeader, rgbHeader_mut, [::BYTE; 5]);
 pub type PSCARD_T0_REQUEST = *mut SCARD_T0_REQUEST;
 pub type LPSCARD_T0_REQUEST = *mut SCARD_T0_REQUEST;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct SCARD_T1_REQUEST {
-    pub ioRequest: SCARD_IO_REQUEST,
-}
+STRUCT!{struct SCARD_T1_REQUEST {
+    ioRequest: SCARD_IO_REQUEST,
+}}
 pub type PSCARD_T1_REQUEST = *mut SCARD_T1_REQUEST;
 pub type LPSCARD_T1_REQUEST = *mut SCARD_T1_REQUEST;
 pub const SCARD_READER_SWALLOWS: ::ULONG = 0x00000001;