about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPietro Albini <pietro@pietroalbini.org>2018-12-05 23:54:33 +0100
committerGitHub <noreply@github.com>2018-12-05 23:54:33 +0100
commit650b4ed5d15cc84552b8aa196170c0e8aac144ec (patch)
tree93c1a1b5288e8ae76732c5a994267712c2a39238
parent1276ffeba2900d409ce8980e86a7bee66aa4ad54 (diff)
parent651373c13d9b9d06af6150bfc897d0f97fc4d919 (diff)
downloadrust-650b4ed5d15cc84552b8aa196170c0e8aac144ec.tar.gz
rust-650b4ed5d15cc84552b8aa196170c0e8aac144ec.zip
Rollup merge of #56466 - ljedrz:delete_tuple_slice, r=nikomatsakis
data_structures: remove tuple_slice

It looks like we're not using it anywhere.
-rw-r--r--src/librustc_data_structures/lib.rs1
-rw-r--r--src/librustc_data_structures/tuple_slice.rs70
2 files changed, 0 insertions, 71 deletions
diff --git a/src/librustc_data_structures/lib.rs b/src/librustc_data_structures/lib.rs
index 96cb235a933..8e0ecb70c68 100644
--- a/src/librustc_data_structures/lib.rs
+++ b/src/librustc_data_structures/lib.rs
@@ -81,7 +81,6 @@ pub mod sync;
 pub mod tiny_list;
 pub mod thin_vec;
 pub mod transitive_relation;
-pub mod tuple_slice;
 pub use ena::unify;
 pub mod vec_linked_list;
 pub mod work_queue;
diff --git a/src/librustc_data_structures/tuple_slice.rs b/src/librustc_data_structures/tuple_slice.rs
deleted file mode 100644
index b7c71dd3664..00000000000
--- a/src/librustc_data_structures/tuple_slice.rs
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use std::slice;
-
-/// Allows to view uniform tuples as slices
-pub trait TupleSlice<T> {
-    fn as_slice(&self) -> &[T];
-    fn as_mut_slice(&mut self) -> &mut [T];
-}
-
-macro_rules! impl_tuple_slice {
-    ($tuple_type:ty, $size:expr) => {
-        impl<T> TupleSlice<T> for $tuple_type {
-            fn as_slice(&self) -> &[T] {
-                unsafe {
-                    let ptr = &self.0 as *const T;
-                    slice::from_raw_parts(ptr, $size)
-                }
-            }
-
-            fn as_mut_slice(&mut self) -> &mut [T] {
-                unsafe {
-                    let ptr = &mut self.0 as *mut T;
-                    slice::from_raw_parts_mut(ptr, $size)
-                }
-            }
-        }
-    }
-}
-
-impl_tuple_slice!((T, T), 2);
-impl_tuple_slice!((T, T, T), 3);
-impl_tuple_slice!((T, T, T, T), 4);
-impl_tuple_slice!((T, T, T, T, T), 5);
-impl_tuple_slice!((T, T, T, T, T, T), 6);
-impl_tuple_slice!((T, T, T, T, T, T, T), 7);
-impl_tuple_slice!((T, T, T, T, T, T, T, T), 8);
-
-#[test]
-fn test_sliced_tuples() {
-    let t2 = (100, 101);
-    assert_eq!(t2.as_slice(), &[100, 101]);
-
-    let t3 = (102, 103, 104);
-    assert_eq!(t3.as_slice(), &[102, 103, 104]);
-
-    let t4 = (105, 106, 107, 108);
-    assert_eq!(t4.as_slice(), &[105, 106, 107, 108]);
-
-    let t5 = (109, 110, 111, 112, 113);
-    assert_eq!(t5.as_slice(), &[109, 110, 111, 112, 113]);
-
-    let t6 = (114, 115, 116, 117, 118, 119);
-    assert_eq!(t6.as_slice(), &[114, 115, 116, 117, 118, 119]);
-
-    let t7 = (120, 121, 122, 123, 124, 125, 126);
-    assert_eq!(t7.as_slice(), &[120, 121, 122, 123, 124, 125, 126]);
-
-    let t8 = (127, 128, 129, 130, 131, 132, 133, 134);
-    assert_eq!(t8.as_slice(), &[127, 128, 129, 130, 131, 132, 133, 134]);
-
-}