Merge pull request #48 from aldanor/feature/1.36

Update to Rust 1.36; fix syn/quote issue with tuple structs

Author: aldanor

.travis.yml

@@ -76,13 +76,18 @@ before_install:
     brew update >/dev/null;
     brew tap homebrew/science;
     brew install hdf5@${H5_BREW};
+    # https://github.com/laumann/compiletest-rs/issues/179
+    export DYLD_LIBRARY_PATH="/usr/lib:/usr/local/lib";
+    brew unlink jpeg giflib libpng libtiff
   fi
 - |
   if [ ! -z "$H5_CONDA" ]; then
     if [ `uname` = "Darwin" ]; then
       wget https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh;
       # note: this is only required for older HDF5 installations on OS X
       export DYLD_FALLBACK_LIBRARY_PATH="$HOME/miniconda/envs/testenv/lib";
+      # https://github.com/laumann/compiletest-rs/issues/179
+      export DYLD_LIBRARY_PATH="$HOME/miniconda/envs/testenv/lib";
     else
       wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
     fi

Cargo.toml

@@ -20,10 +20,10 @@ members = ["hdf5-types", "hdf5-derive", "hdf5-sys"]
 exclude = ["*.yml", "ci/*"]
 
 [dependencies]
-bitflags = "1.0"
+bitflags = "1.1"
 lazy_static = "1.3"
 libc = "0.2"
-parking_lot = "0.7"
+parking_lot = "0.8"
 ndarray = "0.12"
 num-integer = "0.1"
 num-traits = "0.2"
@@ -34,7 +34,7 @@ hdf5-derive = { path = "hdf5-derive", version = "0.5.1" }
 
 [dev-dependencies]
 mashup = "0.1"
-rand = "0.6"
+rand = { version = "0.7", features = ["small_rng"] }
 regex = "1.1"
 scopeguard = "1.0"
 tempdir = "0.3"

appveyor.yml

@@ -12,7 +12,7 @@ init:
 
 environment:
   matrix:
-    - CHANNEL: 1.32.0
+    - CHANNEL: 1.36.0
       H5_VERSION: 1.8.21
       H5_SOURCE: msi
     - CHANNEL: beta

hdf5-derive/Cargo.toml

@@ -18,5 +18,5 @@ quote = "0.6"
 syn = { version = "0.15", features = ["derive", "extra-traits"]}
 
 [dev-dependencies]
-compiletest_rs = { version = "0.3.18", features = ["stable"] }
+compiletest_rs = { version = "0.3.22", features = ["stable"] }
 hdf5 = { version = ">=0.5", path = ".." }

hdf5-derive/src/lib.rs

@@ -9,8 +9,8 @@ use std::str::FromStr;
 use proc_macro2::{Ident, Span, TokenStream};
 use quote::{quote, ToTokens};
 use syn::{
-    parse_macro_input, AttrStyle, Attribute, Data, DeriveInput, Expr, Fields, Meta, NestedMeta,
-    Type, TypeGenerics, TypePath,
+    parse_macro_input, AttrStyle, Attribute, Data, DeriveInput, Expr, Fields, Index,
+    Meta, NestedMeta, Type, TypeGenerics, TypePath,
 };
 
 #[proc_macro_derive(H5Type)]
@@ -146,11 +146,12 @@ fn impl_trait(
                 impl_compound(ty, ty_generics, &fields, &names, &types)
             }
             Fields::Unnamed(ref fields) => {
-                let (index, fields): (Vec<usize>, Vec<_>) = fields
+                let (index, fields): (Vec<Index>, Vec<_>) = fields
                     .unnamed
                     .iter()
                     .enumerate()
                     .filter(|&(_, f)| !is_phantom_data(&f.ty))
+                    .map(|(i, f)| (Index::from(i), f))
                     .unzip();
                 if fields.is_empty() {
                     panic!("Cannot derive H5Type for empty tuple structs");