From 6cb9a7a177029639475471c580cea0156093d2d6 Mon Sep 17 00:00:00 2001
From: Khyber Sen <kkysen@gmail.com>
Date: Thu, 4 Jul 2024 10:15:08 -0700
Subject: [PATCH] `mod looprestoration::neon`: Move `neon`-only imports to `mod
 neon`.

---
 src/looprestoration.rs | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/looprestoration.rs b/src/looprestoration.rs
index 6da5d4780..90e3cf44d 100644
--- a/src/looprestoration.rs
+++ b/src/looprestoration.rs
@@ -26,12 +26,6 @@ use zerocopy::AsBytes;
 use zerocopy::FromBytes;
 use zerocopy::FromZeroes;
 
-#[cfg(all(feature = "asm", any(target_arch = "arm", target_arch = "aarch64")))]
-use ::{std::ffi::c_void, std::ptr};
-
-#[cfg(all(feature = "asm", any(target_arch = "arm", target_arch = "aarch64")))]
-use crate::src::align::Align16;
-
 #[cfg(all(feature = "asm", target_arch = "arm"))]
 use libc::intptr_t;
 
@@ -1018,6 +1012,10 @@ fn sgr_mix_rust<BD: BitDepth>(
 mod neon {
     use super::*;
 
+    use crate::src::align::Align16;
+    use std::ffi::c_void;
+    use std::ptr;
+
     unsafe fn rav1d_wiener_filter_h_neon<BD: BitDepth>(
         dst: &mut [i16],
         left: *const LeftPixelRow<BD::Pixel>,
@@ -1635,6 +1633,10 @@ mod neon {
 mod neon {
     use super::*;
 
+    use crate::src::align::Align16;
+    use std::ffi::c_void;
+    use std::ptr;
+
     fn rotate<const LEN: usize, const MID: usize>(
         a: &mut [*mut i32; LEN],
         b: &mut [*mut i16; LEN],