Merge pull request #100 from mindriot101/fix-build-problem

Fix build problem

Author: simonrw

CHANGELOG.md

@@ -14,6 +14,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 * (`fitsio`) add support for writing all integer header keys
 
 ### Changed
+
+* (`fitsio`) fix errors with the system allocator, ensuring the package will run on the latest nightly and beta compilers [#100](https://github.com/mindriot101/rust-fitsio/pull/100)
+
 ### Removed
 
 ## [0.14.0] - 2018-04-21

bin/test

@@ -2,17 +2,29 @@
 set -e
 set -x
 
+RUST_VERSION=${RUST_VERSION:-stable}
+
+run_cargo() {
+    if [ -z $TRAVIS ]; then
+        # Not running on travis
+        cargo +${RUST_VERSION} $*
+    else
+        # Running on travis
+        cargo $*
+    fi
+}
+
 export CARGO_TARGET_DIR=target
 
 for toml in $(find . -maxdepth 2 -name "Cargo.toml"); do
-    cargo test --manifest-path $toml
+    run_cargo test --manifest-path $toml
 done
 
 # Test the bindgen feature
-cargo test --manifest-path fitsio/Cargo.toml --features bindgen --no-default-features
+run_cargo test --manifest-path fitsio/Cargo.toml --features bindgen --no-default-features
 
 # Test the full example
-cargo run --manifest-path fitsio/Cargo.toml --example full_example
+run_cargo run --manifest-path fitsio/Cargo.toml --example full_example
 
 # Test the array feature
-cargo test --manifest-path fitsio/Cargo.toml --features array
+run_cargo test --manifest-path fitsio/Cargo.toml --features array

bin/travis_test

@@ -14,19 +14,22 @@ pub fn read_row(input: TokenStream) -> TokenStream {
     let mut tokens = Vec::new();
 
     match &input.data {
-        &syn::Data::Struct(ref s) => match &s.fields {
-            &syn::Fields::Named(ref fields) => for field in &fields.named {
-                let ident = &field.ident.as_ref().unwrap();
-                let ident_str = ident.to_string();
-                if field.attrs.is_empty() {
-                    tokens.push(quote! {
-                        out.#ident = tbl.read_cell_value(fits_file, #ident_str, idx)?;
-                    });
-                } else {
-                    for attr in &field.attrs {
-                        match attr.interpret_meta() {
-                            Some(syn::Meta::List(l)) => for entry in l.nested {
-                                match entry {
+        &syn::Data::Struct(ref s) => {
+            match &s.fields {
+                &syn::Fields::Named(ref fields) => {
+                    for field in &fields.named {
+                        let ident = &field.ident.as_ref().unwrap();
+                        let ident_str = ident.to_string();
+                        if field.attrs.is_empty() {
+                            tokens.push(quote! {
+                                out.#ident = tbl.read_cell_value(fits_file, #ident_str, idx)?;
+                            });
+                        } else {
+                            for attr in &field.attrs {
+                                match attr.interpret_meta() {
+                                    Some(syn::Meta::List(l)) => {
+                                        for entry in l.nested {
+                                            match entry {
                                     syn::NestedMeta::Meta(syn::Meta::NameValue(
                                         syn::MetaNameValue {
                                             ident: attr_ident,
@@ -54,18 +57,21 @@ pub fn read_row(input: TokenStream) -> TokenStream {
                                     }
                                     _ => panic!("Only #[fitsio(colname = \"...\")] is supported"),
                                 }
-                            },
-                            _ => panic!("Only #[fitsio(colname = \"...\")] is supported"),
+                                        }
+                                    }
+                                    _ => panic!("Only #[fitsio(colname = \"...\")] is supported"),
+                                }
+                            }
                         }
                     }
                 }
-            },
-            _ => panic!("Only #[fitsio(colname = \"...\")] is supported"),
-        },
+                _ => panic!("Only #[fitsio(colname = \"...\")] is supported"),
+            }
+        }
         _ => panic!("derive only possible for structs"),
     }
 
-    let expanded = quote!{
+    let expanded = quote! {
         impl FitsRow for #name {
             fn from_table(
                 tbl: &::fitsio::hdu::FitsHdu,

fitsio-derive/src/lib.rs

@@ -30,7 +30,8 @@ fn main() {
                 format!(
                     "{} was not found in the pkg-config search path",
                     package_name
-                ).as_ref(),
+                )
+                .as_ref(),
             ) {
                 let err_msg = format!(
                     "

fitsio-sys-bindgen/build.rs

@@ -15,7 +15,8 @@ fn main() {
                 format!(
                     "{} was not found in the pkg-config search path",
                     package_name
-                ).as_ref(),
+                )
+                .as_ref(),
             ) {
                 let err_msg = format!(
                     "

fitsio-sys/build.rs

@@ -0,0 +1 @@
+target

fitsio/.dockerignore

@@ -1,7 +1,28 @@
-FROM rust:1.24.1
+FROM rust:latest
 
 RUN apt-get update && \
-    apt-get install -y libcfitsio-dev pkg-config libclang-3.8-dev build-essential clang
+    apt-get -yq dist-upgrade && \
+    apt-get install -yq --no-install-recommends \
+        libcfitsio-dev \
+        pkg-config \
+        libclang-3.8-dev \
+        build-essential \
+        clang \
+        gdb \
+        && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
+RUN rustup update && \
+    rustup install stable && \
+    rustup install nightly
 
 VOLUME ["/project"]
 WORKDIR "/project/fitsio"
+
+RUN apt-get update && \
+    apt-get install -yq --no-install-recommends \
+        valgrind \
+        && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*

fitsio/Dockerfile

@@ -549,7 +549,8 @@ impl FitsFile {
                 status,
                 // unwrap guaranteed to succesed as status > 0
                 message: status_to_string(status)?.unwrap(),
-            }.into());
+            }
+            .into());
         }
 
         let mut dimensions: Vec<_> = image_description.dimensions.clone().to_vec();
@@ -570,7 +571,8 @@ impl FitsFile {
                 status,
                 // unwrap guaranteed to succesed as status > 0
                 message: status_to_string(status)?.unwrap(),
-            }.into());
+            }
+            .into());
         }
 
         // Current HDU should be at the new HDU
@@ -1073,7 +1075,8 @@ mod test {
                     let hdu = f.hdu(0).unwrap();
                     let naxis: i64 = hdu.read_key(&mut f, "NAXIS").unwrap();
                     assert_eq!(naxis, 0);
-                }).unwrap();
+                })
+                .unwrap();
         });
     }
 
@@ -1268,12 +1271,10 @@ mod test {
         with_temp_file(|filename| {
             {
                 let mut f = FitsFile::create(filename).open().unwrap();
-                let table_description = vec![
-                    ColumnDescription::new("bar")
-                        .with_type(ColumnDataType::Int)
-                        .create()
-                        .unwrap(),
-                ];
+                let table_description = vec![ColumnDescription::new("bar")
+                    .with_type(ColumnDataType::Int)
+                    .create()
+                    .unwrap()];
                 f.create_table("foo".to_string(), &table_description)
                     .unwrap();
             }
@@ -1299,7 +1300,8 @@ mod test {
                         }
                         thing => panic!("{:?}", thing),
                     }
-                }).unwrap();
+                })
+                .unwrap();
         });
     }
 
@@ -1325,7 +1327,8 @@ mod test {
                         }
                         thing => panic!("{:?}", thing),
                     }
-                }).unwrap();
+                })
+                .unwrap();
         });
     }
 
@@ -1365,9 +1368,9 @@ mod test {
                 .read_region(&mut f, &vec![&xcoord, &ycoord, &zcoord])
                 .unwrap();
 
-            assert_eq!(read_data.len(), 96);
-            assert_eq!(read_data[0], 712);
-            assert_eq!(read_data[50], 942);
+            assert_eq!(read_data.len(), (6 - 2) * (17 - 11) * (7 - 3));
+            assert_eq!(read_data[0], 614);
+            assert_eq!(read_data[50], 958);
         });
     }
 
@@ -1442,12 +1445,10 @@ mod test {
     fn test_creating_new_table_returns_hdu_object() {
         with_temp_file(|filename| {
             let mut f = FitsFile::create(filename).open().unwrap();
-            let table_description = vec![
-                ColumnDescription::new("bar")
-                    .with_type(ColumnDataType::Int)
-                    .create()
-                    .unwrap(),
-            ];
+            let table_description = vec![ColumnDescription::new("bar")
+                .with_type(ColumnDataType::Int)
+                .create()
+                .unwrap()];
             let hdu: FitsHdu = f
                 .create_table("foo".to_string(), &table_description)
                 .unwrap();

fitsio/src/fitsfile.rs

@@ -226,7 +226,8 @@ mod tests {
                         f.hdu(0).unwrap().read_key::<String>(&mut f, "bar").unwrap(),
                         "baz".to_string()
                     );
-                }).unwrap();
+                })
+                .unwrap();
         });
     }