Merge pull request #6 from swiftcoder/travis

swiftcoder · web-flow · commit b35bd9566b3f · 2020-06-17T19:32:13.000-07:00
Fix travis CI config
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,7 @@
 language: rust
+cache: cargo
 before_script:
-- rustup component add rustfmt-preview
+- rustup component add rustfmt
 rust:
   - stable
   - beta
@@ -10,6 +11,6 @@ matrix:
     - rust: nightly
   fast_finish: true
 script:
-- cargo fmt --all -- --write-mode=diff
+- cargo fmt --all -- --check
 - cargo build
 - cargo test
diff --git a/examples/common/mod.rs b/examples/common/mod.rs
@@ -15,8 +15,8 @@
 pub mod sources;
 pub mod text;
 
-use std::slice;
 use std::mem;
+use std::slice;
 
 /// This is used to reinterpret slices of floats as slices of repr(C) structs, without any
 /// copying. It is optimal, but it is also punching holes in the type system. I hope that Rust
diff --git a/src/marching_cubes_tables.rs b/src/marching_cubes_tables.rs
@@ -43,7 +43,7 @@ pub const EDGE_CONNECTION: [[usize; 2]; 12] = [
 /// Maps the signs of each corner in a cell to the set of triangles spanning the active edges
 pub const TRIANGLE_CONNECTION: [[i8; 16]; 256] = [
     [
-        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
     ],
     [0, 8, 3, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
     [0, 1, 9, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
@@ -300,6 +300,6 @@ pub const TRIANGLE_CONNECTION: [[i8; 16]; 256] = [
     [0, 9, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
     [0, 3, 8, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
     [
-        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
     ],
 ];
