user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix a merge conflict

Browse source
This commit is contained in:
Alex Crichton 2017-09-26 14:53:20 -07:00
parent 129f7191dd
commit 2660ba176e
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
library/stdarch/src/x86/avx2.rs
View file

@ -3,7 +3,7 @@ use v128::*;
use x86::__m256i;
#[cfg(test)]
use assert_instr::assert_instr;
use stdsimd_test::assert_instr;
/// Computes the absolute values of packed 32-bit integers in `a`.
#[inline(always)]

2
library/stdarch/src/x86/sse41.rs
View file

@ -2,7 +2,7 @@ use v128::*;
use x86::__m128i;
#[cfg(test)]
use assert_instr::assert_instr;
use stdsimd_test::assert_instr;
#[inline(always)]
#[target_feature = "+sse4.1"]

2
library/stdarch/src/x86/ssse3.rs
View file

@ -1,7 +1,7 @@
use v128::*;
#[cfg(test)]
use assert_instr::assert_instr;
use stdsimd_test::assert_instr;
/// Compute the absolute value of packed 8-bit signed integers in `a` and
/// return the unsigned results.