Skip to content

Commit 31ec80e

Browse files
committed
Auto merge of #120 - Amanieu:fix_ci2, r=Amanieu
Fix CI
2 parents d1ad4fc + 7938188 commit 31ec80e

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

.travis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,9 @@ matrix:
5151
os: windows
5252
- name: "x86_64-pc-windows-gnu"
5353
env: TARGET=x86_64-pc-windows-gnu CROSS=1
54-
- name: "i686-pc-windows-gnu"
55-
env: TARGET=i686-pc-windows-gnu CROSS=1
54+
# This target is not supported by cross
55+
#- name: "i686-pc-windows-gnu"
56+
# env: TARGET=i686-pc-windows-gnu CROSS=1
5657

5758
# Tier 2/3 targets:
5859
- name: "i586-unknown-linux-gnu (no SSE2)"

src/raw/generic.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,7 @@ type GroupWord = u32;
2121
pub type BitMaskWord = GroupWord;
2222
pub const BITMASK_STRIDE: usize = 8;
2323
// We only care about the highest bit of each byte for the mask.
24-
#[allow(
25-
clippy::cast_possible_truncation,
26-
clippy::unnecessary_cast,
27-
)]
24+
#[allow(clippy::cast_possible_truncation, clippy::unnecessary_cast)]
2825
pub const BITMASK_MASK: BitMaskWord = 0x8080_8080_8080_8080_u64 as GroupWord;
2926

3027
/// Helper function to replicate a byte across a `GroupWord`.

src/raw/sse2.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,10 @@ impl Group {
135135
unsafe {
136136
let zero = x86::_mm_setzero_si128();
137137
let special = x86::_mm_cmpgt_epi8(zero, self.0);
138-
Group(x86::_mm_or_si128(special, x86::_mm_set1_epi8(0x80_u8 as i8)))
138+
Group(x86::_mm_or_si128(
139+
special,
140+
x86::_mm_set1_epi8(0x80_u8 as i8),
141+
))
139142
}
140143
}
141144
}

0 commit comments

Comments
 (0)