Auto merge of #120 - Amanieu:fix_ci2, r=Amanieu

Fix CI
rust-lang · Oct 4, 2019 · 31ec80e · 31ec80e
2 parents d1ad4fc + 7938188
commit 31ec80e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -51,8 +51,9 @@ matrix:
       os: windows
     - name: "x86_64-pc-windows-gnu"
       env: TARGET=x86_64-pc-windows-gnu CROSS=1
-    - name: "i686-pc-windows-gnu"
-      env: TARGET=i686-pc-windows-gnu CROSS=1
+    # This target is not supported by cross
+    #- name: "i686-pc-windows-gnu"
+    #  env: TARGET=i686-pc-windows-gnu CROSS=1
 
     # Tier 2/3 targets:
     - name: "i586-unknown-linux-gnu (no SSE2)"

diff --git a/src/raw/generic.rs b/src/raw/generic.rs
@@ -21,10 +21,7 @@ type GroupWord = u32;
 pub type BitMaskWord = GroupWord;
 pub const BITMASK_STRIDE: usize = 8;
 // We only care about the highest bit of each byte for the mask.
-#[allow(
-    clippy::cast_possible_truncation,
-    clippy::unnecessary_cast,
-)]
+#[allow(clippy::cast_possible_truncation, clippy::unnecessary_cast)]
 pub const BITMASK_MASK: BitMaskWord = 0x8080_8080_8080_8080_u64 as GroupWord;
 
 /// Helper function to replicate a byte across a `GroupWord`.

diff --git a/src/raw/sse2.rs b/src/raw/sse2.rs
@@ -135,7 +135,10 @@ impl Group {
         unsafe {
             let zero = x86::_mm_setzero_si128();
             let special = x86::_mm_cmpgt_epi8(zero, self.0);
-            Group(x86::_mm_or_si128(special, x86::_mm_set1_epi8(0x80_u8 as i8)))
+            Group(x86::_mm_or_si128(
+                special,
+                x86::_mm_set1_epi8(0x80_u8 as i8),
+            ))
         }
     }
 }