#[inline(always)] on forwarding slice/vec methods

rust-lang · May 12, 2021 · f4cf82d · f4cf82d
1 parent 3773740
commit f4cf82d
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 29 deletions.
diff --git a/library/alloc/src/vec/mod.rs b/library/alloc/src/vec/mod.rs
@@ -775,7 +775,7 @@ impl<T, A: Allocator> Vec<T, A> {
     /// let vec: Vec<i32> = Vec::with_capacity(10);
     /// assert_eq!(vec.capacity(), 10);
     /// ```
-    #[inline]
+    #[inline(always)]
     #[stable(feature = "rust1", since = "1.0.0")]
     pub fn capacity(&self) -> usize {
         self.buf.capacity()
@@ -1078,7 +1078,7 @@ impl<T, A: Allocator> Vec<T, A> {
     /// let buffer = vec![1, 2, 3, 5, 8];
     /// io::sink().write(buffer.as_slice()).unwrap();
     /// ```
-    #[inline]
+    #[inline(always)]
     #[stable(feature = "vec_as_slice", since = "1.7.0")]
     pub fn as_slice(&self) -> &[T] {
         self
@@ -1095,7 +1095,7 @@ impl<T, A: Allocator> Vec<T, A> {
     /// let mut buffer = vec![0; 3];
     /// io::repeat(0b101).read_exact(buffer.as_mut_slice()).unwrap();
     /// ```
-    #[inline]
+    #[inline(always)]
     #[stable(feature = "vec_as_slice", since = "1.7.0")]
     pub fn as_mut_slice(&mut self) -> &mut [T] {
         self
@@ -1820,7 +1820,7 @@ impl<T, A: Allocator> Vec<T, A> {
     /// assert_eq!(a.len(), 3);
     /// ```
     #[doc(alias = "length")]
-    #[inline]
+    #[inline(always)]
     #[stable(feature = "rust1", since = "1.0.0")]
     pub fn len(&self) -> usize {
         self.len
@@ -2422,7 +2422,7 @@ impl<T: Hash, A: Allocator> Hash for Vec<T, A> {
 impl<T, I: SliceIndex<[T]>, A: Allocator> Index<I> for Vec<T, A> {
     type Output = I::Output;
 
-    #[inline]
+    #[inline(always)]
     fn index(&self, index: I) -> &Self::Output {
         Index::index(&**self, index)
     }
@@ -2434,7 +2434,7 @@ impl<T, I: SliceIndex<[T]>, A: Allocator> Index<I> for Vec<T, A> {
     label = "vector indices are of type `usize` or ranges of `usize`"
 )]
 impl<T, I: SliceIndex<[T]>, A: Allocator> IndexMut<I> for Vec<T, A> {
-    #[inline]
+    #[inline(always)]
     fn index_mut(&mut self, index: I) -> &mut Self::Output {
         IndexMut::index_mut(&mut **self, index)
     }
@@ -2496,6 +2496,7 @@ impl<'a, T, A: Allocator> IntoIterator for &'a Vec<T, A> {
     type Item = &'a T;
     type IntoIter = slice::Iter<'a, T>;
 
+    #[inline(always)]
     fn into_iter(self) -> slice::Iter<'a, T> {
         self.iter()
     }
@@ -2506,6 +2507,7 @@ impl<'a, T, A: Allocator> IntoIterator for &'a mut Vec<T, A> {
     type Item = &'a mut T;
     type IntoIter = slice::IterMut<'a, T>;
 
+    #[inline(always)]
     fn into_iter(self) -> slice::IterMut<'a, T> {
         self.iter_mut()
     }

diff --git a/library/core/src/iter/range.rs b/library/core/src/iter/range.rs
@@ -107,6 +107,7 @@ pub unsafe trait Step: Clone + PartialOrd + Sized {
     ///
     /// * `Step::forward_unchecked(a, n)` is equivalent to `Step::forward(a, n)`
     #[unstable(feature = "step_trait_ext", reason = "recently added", issue = "42168")]
+    #[inline(always)]
     unsafe fn forward_unchecked(start: Self, count: usize) -> Self {
         Step::forward(start, count)
     }
@@ -179,6 +180,7 @@ pub unsafe trait Step: Clone + PartialOrd + Sized {
     ///
     /// * `Step::backward_unchecked(a, n)` is equivalent to `Step::backward(a, n)`
     #[unstable(feature = "step_trait_ext", reason = "recently added", issue = "42168")]
+    #[inline(always)]
     unsafe fn backward_unchecked(start: Self, count: usize) -> Self {
         Step::backward(start, count)
     }
@@ -187,13 +189,13 @@ pub unsafe trait Step: Clone + PartialOrd + Sized {
 // These are still macro-generated because the integer literals resolve to different types.
 macro_rules! step_identical_methods {
     () => {
-        #[inline]
+        #[inline(always)]
         unsafe fn forward_unchecked(start: Self, n: usize) -> Self {
             // SAFETY: the caller has to guarantee that `start + n` doesn't overflow.
             unsafe { start.unchecked_add(n as Self) }
         }
 
-        #[inline]
+        #[inline(always)]
         unsafe fn backward_unchecked(start: Self, n: usize) -> Self {
             // SAFETY: the caller has to guarantee that `start - n` doesn't overflow.
             unsafe { start.unchecked_sub(n as Self) }
@@ -345,12 +347,12 @@ macro_rules! step_integer_impls {
                     }
                 }
 
-                #[inline]
+                #[inline(always)]
                 fn forward_checked(start: Self, n: usize) -> Option<Self> {
                     start.checked_add(n as Self)
                 }
 
-                #[inline]
+                #[inline(always)]
                 fn backward_checked(start: Self, n: usize) -> Option<Self> {
                     start.checked_sub(n as Self)
                 }
@@ -375,12 +377,12 @@ macro_rules! step_integer_impls {
                     }
                 }
 
-                #[inline]
+                #[inline(always)]
                 fn forward_checked(start: Self, n: usize) -> Option<Self> {
                     start.checked_add(n as Self)
                 }
 
-                #[inline]
+                #[inline(always)]
                 fn backward_checked(start: Self, n: usize) -> Option<Self> {
                     start.checked_sub(n as Self)
                 }
@@ -551,17 +553,17 @@ impl<A: Step> Iterator for ops::Range<A> {
         None
     }
 
-    #[inline]
+    #[inline(always)]
     fn last(mut self) -> Option<A> {
         self.next_back()
     }
 
-    #[inline]
+    #[inline(always)]
     fn min(mut self) -> Option<A> {
         self.next()
     }
 
-    #[inline]
+    #[inline(always)]
     fn max(mut self) -> Option<A> {
         self.next_back()
     }
@@ -671,7 +673,7 @@ impl<A: Step> Iterator for ops::RangeFrom<A> {
         Some(mem::replace(&mut self.start, n))
     }
 
-    #[inline]
+    #[inline(always)]
     fn size_hint(&self) -> (usize, Option<usize>) {
         (usize::MAX, None)
     }
@@ -793,17 +795,17 @@ impl<A: Step> Iterator for ops::RangeInclusive<A> {
         self.try_fold(init, ok(f)).unwrap()
     }
 
-    #[inline]
+    #[inline(always)]
     fn last(mut self) -> Option<A> {
         self.next_back()
     }
 
-    #[inline]
+    #[inline(always)]
     fn min(mut self) -> Option<A> {
         self.next()
     }
 
-    #[inline]
+    #[inline(always)]
     fn max(mut self) -> Option<A> {
         self.next_back()
     }

diff --git a/library/core/src/slice/iter.rs b/library/core/src/slice/iter.rs
@@ -21,6 +21,7 @@ impl<'a, T> IntoIterator for &'a [T] {
     type Item = &'a T;
     type IntoIter = Iter<'a, T>;
 
+    #[inline(always)]
     fn into_iter(self) -> Iter<'a, T> {
         self.iter()
     }
@@ -31,6 +32,7 @@ impl<'a, T> IntoIterator for &'a mut [T] {
     type Item = &'a mut T;
     type IntoIter = IterMut<'a, T>;
 
+    #[inline(always)]
     fn into_iter(self) -> IterMut<'a, T> {
         self.iter_mut()
     }

diff --git a/library/core/src/slice/mod.rs b/library/core/src/slice/mod.rs
@@ -299,7 +299,7 @@ impl<T> [T] {
     /// assert_eq!(None, v.get(0..4));
     /// ```
     #[stable(feature = "rust1", since = "1.0.0")]
-    #[inline]
+    #[inline(always)]
     pub fn get<I>(&self, index: I) -> Option<&I::Output>
     where
         I: SliceIndex<Self>,
@@ -323,7 +323,7 @@ impl<T> [T] {
     /// assert_eq!(x, &[0, 42, 2]);
     /// ```
     #[stable(feature = "rust1", since = "1.0.0")]
-    #[inline]
+    #[inline(always)]
     pub fn get_mut<I>(&mut self, index: I) -> Option<&mut I::Output>
     where
         I: SliceIndex<Self>,
@@ -354,7 +354,7 @@ impl<T> [T] {
     /// }
     /// ```
     #[stable(feature = "rust1", since = "1.0.0")]
-    #[inline]
+    #[inline(always)]
     pub unsafe fn get_unchecked<I>(&self, index: I) -> &I::Output
     where
         I: SliceIndex<Self>,
@@ -390,7 +390,7 @@ impl<T> [T] {
     /// assert_eq!(x, &[1, 13, 4]);
     /// ```
     #[stable(feature = "rust1", since = "1.0.0")]
-    #[inline]
+    #[inline(always)]
     pub unsafe fn get_unchecked_mut<I>(&mut self, index: I) -> &mut I::Output
     where
         I: SliceIndex<Self>,
@@ -429,7 +429,7 @@ impl<T> [T] {
     /// [`as_mut_ptr`]: slice::as_mut_ptr
     #[stable(feature = "rust1", since = "1.0.0")]
     #[rustc_const_stable(feature = "const_slice_as_ptr", since = "1.32.0")]
-    #[inline]
+    #[inline(always)]
     pub const fn as_ptr(&self) -> *const T {
         self as *const [T] as *const T
     }
@@ -457,7 +457,7 @@ impl<T> [T] {
     /// ```
     #[stable(feature = "rust1", since = "1.0.0")]
     #[rustc_const_unstable(feature = "const_ptr_offset", issue = "71499")]
-    #[inline]
+    #[inline(always)]
     pub const fn as_mut_ptr(&mut self) -> *mut T {
         self as *mut [T] as *mut T
     }
@@ -702,7 +702,7 @@ impl<T> [T] {
     /// assert_eq!(iterator.next(), None);
     /// ```
     #[stable(feature = "rust1", since = "1.0.0")]
-    #[inline]
+    #[inline(always)]
     pub fn iter(&self) -> Iter<'_, T> {
         Iter::new(self)
     }
@@ -719,7 +719,7 @@ impl<T> [T] {
     /// assert_eq!(x, &[3, 4, 6]);
     /// ```
     #[stable(feature = "rust1", since = "1.0.0")]
-    #[inline]
+    #[inline(always)]
     pub fn iter_mut(&mut self) -> IterMut<'_, T> {
         IterMut::new(self)
     }
@@ -3544,7 +3544,7 @@ pub trait SlicePattern {
 impl<T> SlicePattern for [T] {
     type Item = T;
 
-    #[inline]
+    #[inline(always)]
     fn as_slice(&self) -> &[Self::Item] {
         self
     }
@@ -3554,7 +3554,7 @@ impl<T> SlicePattern for [T] {
 impl<T, const N: usize> SlicePattern for [T; N] {
     type Item = T;
 
-    #[inline]
+    #[inline(always)]
     fn as_slice(&self) -> &[Self::Item] {
         self
     }