Merge pull request rust-ndarray#404 from jturner314/slice-unsafe-code2

Allow use of s![] with #[deny(unsafe_code)]
paulkernfeld · Jan 11, 2018 · 8126097 · 8126097
2 parents 067bb9f + 6cdf3b9
commit 8126097
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/src/slice.rs b/src/slice.rs
@@ -538,6 +538,7 @@ macro_rules! s(
         match $r {
             r => {
                 let out_dim = $crate::SliceNextDim::next_dim(&r, $dim);
+                #[allow(unsafe_code)]
                 unsafe {
                     $crate::SliceInfo::new_unchecked(
                         [$($stack)* s!(@convert r, $s)],
@@ -552,6 +553,7 @@ macro_rules! s(
         match $r {
             r => {
                 let out_dim = $crate::SliceNextDim::next_dim(&r, $dim);
+                #[allow(unsafe_code)]
                 unsafe {
                     $crate::SliceInfo::new_unchecked(
                         [$($stack)* s!(@convert r)],

diff --git a/tests/array.rs b/tests/array.rs
@@ -52,6 +52,7 @@ fn test_mat_mul() {
 }
 
 
+#[deny(unsafe_code)]
 #[test]
 fn test_slice()
 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -52,6 +52,7 @@ fn test_mat_mul() { @@
     }
+    #[deny(unsafe_code)]
     #[test]
     fn test_slice()
     {
@@ Expand Down @@