From 2660ba176e0da47e588d3198aceba6a60d4c7d71 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Tue, 26 Sep 2017 14:53:20 -0700 Subject: [PATCH] Fix a merge conflict --- library/stdarch/src/x86/avx2.rs | 2 +- library/stdarch/src/x86/sse41.rs | 2 +- library/stdarch/src/x86/ssse3.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/library/stdarch/src/x86/avx2.rs b/library/stdarch/src/x86/avx2.rs index 9c9c75f360fc..5cb85c161467 100644 --- a/library/stdarch/src/x86/avx2.rs +++ b/library/stdarch/src/x86/avx2.rs @@ -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)] diff --git a/library/stdarch/src/x86/sse41.rs b/library/stdarch/src/x86/sse41.rs index 447bdd19d127..0ca528a80b15 100644 --- a/library/stdarch/src/x86/sse41.rs +++ b/library/stdarch/src/x86/sse41.rs @@ -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"] diff --git a/library/stdarch/src/x86/ssse3.rs b/library/stdarch/src/x86/ssse3.rs index 9adde849cd94..2ad0a8efe913 100644 --- a/library/stdarch/src/x86/ssse3.rs +++ b/library/stdarch/src/x86/ssse3.rs @@ -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.