Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

std: Cut down #[inline] annotations where not necessary #43367

Merged
merged 1 commit into from
Jul 22, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/libcore/clone.rs
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ pub trait Clone : Sized {
/// `a.clone_from(&b)` is equivalent to `a = b.clone()` in functionality,
/// but can be overridden to reuse the resources of `a` to avoid unnecessary
/// allocations.
#[inline(always)]
#[inline]
#[stable(feature = "rust1", since = "1.0.0")]
fn clone_from(&mut self, source: &Self) {
*self = source.clone()
Expand Down
2 changes: 1 addition & 1 deletion src/libcore/cmp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ pub trait Eq: PartialEq<Self> {
//
// This should never be implemented by hand.
#[doc(hidden)]
#[inline(always)]
#[inline]
#[stable(feature = "rust1", since = "1.0.0")]
fn assert_receiver_is_total_eq(&self) {}
}
Expand Down
2 changes: 1 addition & 1 deletion src/libcore/hash/sip.rs
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ impl<S: Sip> Hasher<S> {
// except for composite types (that includes slices and str hashing because of delimiter).
// Without this extra push the compiler is very reluctant to inline delimiter writes,
// degrading performance substantially for the most common use cases.
#[inline(always)]
#[inline]
fn short_write(&mut self, msg: &[u8]) {
debug_assert!(msg.len() <= 8);
let length = msg.len();
Expand Down
2 changes: 1 addition & 1 deletion src/libcore/nonzero.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ pub struct NonZero<T: Zeroable>(T);
impl<T: Zeroable> NonZero<T> {
/// Creates an instance of NonZero with the provided value.
/// You must indeed ensure that the value is actually "non-zero".
#[inline(always)]
#[inline]
pub const unsafe fn new(inner: T) -> NonZero<T> {
NonZero(inner)
}
Expand Down
22 changes: 11 additions & 11 deletions src/libcore/num/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -695,7 +695,7 @@ macro_rules! int_impl {
/// assert_eq!((-128i8).wrapping_div(-1), -128);
/// ```
#[stable(feature = "num_wrapping", since = "1.2.0")]
#[inline(always)]
#[inline]
pub fn wrapping_div(self, rhs: Self) -> Self {
self.overflowing_div(rhs).0
}
Expand All @@ -721,7 +721,7 @@ macro_rules! int_impl {
/// assert_eq!((-128i8).wrapping_rem(-1), 0);
/// ```
#[stable(feature = "num_wrapping", since = "1.2.0")]
#[inline(always)]
#[inline]
pub fn wrapping_rem(self, rhs: Self) -> Self {
self.overflowing_rem(rhs).0
}
Expand All @@ -744,7 +744,7 @@ macro_rules! int_impl {
/// assert_eq!((-128i8).wrapping_neg(), -128);
/// ```
#[stable(feature = "num_wrapping", since = "1.2.0")]
#[inline(always)]
#[inline]
pub fn wrapping_neg(self) -> Self {
self.overflowing_neg().0
}
Expand All @@ -769,7 +769,7 @@ macro_rules! int_impl {
/// assert_eq!((-1i8).wrapping_shl(8), -1);
/// ```
#[stable(feature = "num_wrapping", since = "1.2.0")]
#[inline(always)]
#[inline]
pub fn wrapping_shl(self, rhs: u32) -> Self {
unsafe {
intrinsics::unchecked_shl(self, (rhs & ($BITS - 1)) as $SelfT)
Expand All @@ -796,7 +796,7 @@ macro_rules! int_impl {
/// assert_eq!((-128i8).wrapping_shr(8), -128);
/// ```
#[stable(feature = "num_wrapping", since = "1.2.0")]
#[inline(always)]
#[inline]
pub fn wrapping_shr(self, rhs: u32) -> Self {
unsafe {
intrinsics::unchecked_shr(self, (rhs & ($BITS - 1)) as $SelfT)
Expand All @@ -822,7 +822,7 @@ macro_rules! int_impl {
/// assert_eq!((-128i8).wrapping_abs() as u8, 128);
/// ```
#[stable(feature = "no_panic_abs", since = "1.13.0")]
#[inline(always)]
#[inline]
pub fn wrapping_abs(self) -> Self {
if self.is_negative() {
self.wrapping_neg()
Expand Down Expand Up @@ -1831,7 +1831,7 @@ macro_rules! uint_impl {
/// assert_eq!(100u8.wrapping_div(10), 10);
/// ```
#[stable(feature = "num_wrapping", since = "1.2.0")]
#[inline(always)]
#[inline]
pub fn wrapping_div(self, rhs: Self) -> Self {
self / rhs
}
Expand All @@ -1851,7 +1851,7 @@ macro_rules! uint_impl {
/// assert_eq!(100u8.wrapping_rem(10), 0);
/// ```
#[stable(feature = "num_wrapping", since = "1.2.0")]
#[inline(always)]
#[inline]
pub fn wrapping_rem(self, rhs: Self) -> Self {
self % rhs
}
Expand All @@ -1877,7 +1877,7 @@ macro_rules! uint_impl {
/// assert_eq!(180u8.wrapping_neg(), (127 + 1) - (180u8 - (127 + 1)));
/// ```
#[stable(feature = "num_wrapping", since = "1.2.0")]
#[inline(always)]
#[inline]
pub fn wrapping_neg(self) -> Self {
self.overflowing_neg().0
}
Expand All @@ -1902,7 +1902,7 @@ macro_rules! uint_impl {
/// assert_eq!(1u8.wrapping_shl(8), 1);
/// ```
#[stable(feature = "num_wrapping", since = "1.2.0")]
#[inline(always)]
#[inline]
pub fn wrapping_shl(self, rhs: u32) -> Self {
unsafe {
intrinsics::unchecked_shl(self, (rhs & ($BITS - 1)) as $SelfT)
Expand All @@ -1929,7 +1929,7 @@ macro_rules! uint_impl {
/// assert_eq!(128u8.wrapping_shr(8), 128);
/// ```
#[stable(feature = "num_wrapping", since = "1.2.0")]
#[inline(always)]
#[inline]
pub fn wrapping_shr(self, rhs: u32) -> Self {
unsafe {
intrinsics::unchecked_shr(self, (rhs & ($BITS - 1)) as $SelfT)
Expand Down
52 changes: 26 additions & 26 deletions src/libcore/num/wrapping.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ macro_rules! sh_impl_signed {
impl Shl<$f> for Wrapping<$t> {
type Output = Wrapping<$t>;

#[inline(always)]
#[inline]
fn shl(self, other: $f) -> Wrapping<$t> {
if other < 0 {
Wrapping(self.0.wrapping_shr((-other & self::shift_max::$t as $f) as u32))
Expand All @@ -31,7 +31,7 @@ macro_rules! sh_impl_signed {

#[stable(feature = "op_assign_traits", since = "1.8.0")]
impl ShlAssign<$f> for Wrapping<$t> {
#[inline(always)]
#[inline]
fn shl_assign(&mut self, other: $f) {
*self = *self << other;
}
Expand All @@ -41,7 +41,7 @@ macro_rules! sh_impl_signed {
impl Shr<$f> for Wrapping<$t> {
type Output = Wrapping<$t>;

#[inline(always)]
#[inline]
fn shr(self, other: $f) -> Wrapping<$t> {
if other < 0 {
Wrapping(self.0.wrapping_shl((-other & self::shift_max::$t as $f) as u32))
Expand All @@ -53,7 +53,7 @@ macro_rules! sh_impl_signed {

#[stable(feature = "op_assign_traits", since = "1.8.0")]
impl ShrAssign<$f> for Wrapping<$t> {
#[inline(always)]
#[inline]
fn shr_assign(&mut self, other: $f) {
*self = *self >> other;
}
Expand All @@ -67,15 +67,15 @@ macro_rules! sh_impl_unsigned {
impl Shl<$f> for Wrapping<$t> {
type Output = Wrapping<$t>;

#[inline(always)]
#[inline]
fn shl(self, other: $f) -> Wrapping<$t> {
Wrapping(self.0.wrapping_shl((other & self::shift_max::$t as $f) as u32))
}
}

#[stable(feature = "op_assign_traits", since = "1.8.0")]
impl ShlAssign<$f> for Wrapping<$t> {
#[inline(always)]
#[inline]
fn shl_assign(&mut self, other: $f) {
*self = *self << other;
}
Expand All @@ -85,15 +85,15 @@ macro_rules! sh_impl_unsigned {
impl Shr<$f> for Wrapping<$t> {
type Output = Wrapping<$t>;

#[inline(always)]
#[inline]
fn shr(self, other: $f) -> Wrapping<$t> {
Wrapping(self.0.wrapping_shr((other & self::shift_max::$t as $f) as u32))
}
}

#[stable(feature = "op_assign_traits", since = "1.8.0")]
impl ShrAssign<$f> for Wrapping<$t> {
#[inline(always)]
#[inline]
fn shr_assign(&mut self, other: $f) {
*self = *self >> other;
}
Expand Down Expand Up @@ -127,7 +127,7 @@ macro_rules! wrapping_impl {
impl Add for Wrapping<$t> {
type Output = Wrapping<$t>;

#[inline(always)]
#[inline]
fn add(self, other: Wrapping<$t>) -> Wrapping<$t> {
Wrapping(self.0.wrapping_add(other.0))
}
Expand All @@ -137,7 +137,7 @@ macro_rules! wrapping_impl {

#[stable(feature = "op_assign_traits", since = "1.8.0")]
impl AddAssign for Wrapping<$t> {
#[inline(always)]
#[inline]
fn add_assign(&mut self, other: Wrapping<$t>) {
*self = *self + other;
}
Expand All @@ -147,7 +147,7 @@ macro_rules! wrapping_impl {
impl Sub for Wrapping<$t> {
type Output = Wrapping<$t>;

#[inline(always)]
#[inline]
fn sub(self, other: Wrapping<$t>) -> Wrapping<$t> {
Wrapping(self.0.wrapping_sub(other.0))
}
Expand All @@ -157,7 +157,7 @@ macro_rules! wrapping_impl {

#[stable(feature = "op_assign_traits", since = "1.8.0")]
impl SubAssign for Wrapping<$t> {
#[inline(always)]
#[inline]
fn sub_assign(&mut self, other: Wrapping<$t>) {
*self = *self - other;
}
Expand All @@ -167,7 +167,7 @@ macro_rules! wrapping_impl {
impl Mul for Wrapping<$t> {
type Output = Wrapping<$t>;

#[inline(always)]
#[inline]
fn mul(self, other: Wrapping<$t>) -> Wrapping<$t> {
Wrapping(self.0.wrapping_mul(other.0))
}
Expand All @@ -177,7 +177,7 @@ macro_rules! wrapping_impl {

#[stable(feature = "op_assign_traits", since = "1.8.0")]
impl MulAssign for Wrapping<$t> {
#[inline(always)]
#[inline]
fn mul_assign(&mut self, other: Wrapping<$t>) {
*self = *self * other;
}
Expand All @@ -187,7 +187,7 @@ macro_rules! wrapping_impl {
impl Div for Wrapping<$t> {
type Output = Wrapping<$t>;

#[inline(always)]
#[inline]
fn div(self, other: Wrapping<$t>) -> Wrapping<$t> {
Wrapping(self.0.wrapping_div(other.0))
}
Expand All @@ -197,7 +197,7 @@ macro_rules! wrapping_impl {

#[stable(feature = "op_assign_traits", since = "1.8.0")]
impl DivAssign for Wrapping<$t> {
#[inline(always)]
#[inline]
fn div_assign(&mut self, other: Wrapping<$t>) {
*self = *self / other;
}
Expand All @@ -207,7 +207,7 @@ macro_rules! wrapping_impl {
impl Rem for Wrapping<$t> {
type Output = Wrapping<$t>;

#[inline(always)]
#[inline]
fn rem(self, other: Wrapping<$t>) -> Wrapping<$t> {
Wrapping(self.0.wrapping_rem(other.0))
}
Expand All @@ -217,7 +217,7 @@ macro_rules! wrapping_impl {

#[stable(feature = "op_assign_traits", since = "1.8.0")]
impl RemAssign for Wrapping<$t> {
#[inline(always)]
#[inline]
fn rem_assign(&mut self, other: Wrapping<$t>) {
*self = *self % other;
}
Expand All @@ -227,7 +227,7 @@ macro_rules! wrapping_impl {
impl Not for Wrapping<$t> {
type Output = Wrapping<$t>;

#[inline(always)]
#[inline]
fn not(self) -> Wrapping<$t> {
Wrapping(!self.0)
}
Expand All @@ -239,7 +239,7 @@ macro_rules! wrapping_impl {
impl BitXor for Wrapping<$t> {
type Output = Wrapping<$t>;

#[inline(always)]
#[inline]
fn bitxor(self, other: Wrapping<$t>) -> Wrapping<$t> {
Wrapping(self.0 ^ other.0)
}
Expand All @@ -249,7 +249,7 @@ macro_rules! wrapping_impl {

#[stable(feature = "op_assign_traits", since = "1.8.0")]
impl BitXorAssign for Wrapping<$t> {
#[inline(always)]
#[inline]
fn bitxor_assign(&mut self, other: Wrapping<$t>) {
*self = *self ^ other;
}
Expand All @@ -259,7 +259,7 @@ macro_rules! wrapping_impl {
impl BitOr for Wrapping<$t> {
type Output = Wrapping<$t>;

#[inline(always)]
#[inline]
fn bitor(self, other: Wrapping<$t>) -> Wrapping<$t> {
Wrapping(self.0 | other.0)
}
Expand All @@ -269,7 +269,7 @@ macro_rules! wrapping_impl {

#[stable(feature = "op_assign_traits", since = "1.8.0")]
impl BitOrAssign for Wrapping<$t> {
#[inline(always)]
#[inline]
fn bitor_assign(&mut self, other: Wrapping<$t>) {
*self = *self | other;
}
Expand All @@ -279,7 +279,7 @@ macro_rules! wrapping_impl {
impl BitAnd for Wrapping<$t> {
type Output = Wrapping<$t>;

#[inline(always)]
#[inline]
fn bitand(self, other: Wrapping<$t>) -> Wrapping<$t> {
Wrapping(self.0 & other.0)
}
Expand All @@ -289,7 +289,7 @@ macro_rules! wrapping_impl {

#[stable(feature = "op_assign_traits", since = "1.8.0")]
impl BitAndAssign for Wrapping<$t> {
#[inline(always)]
#[inline]
fn bitand_assign(&mut self, other: Wrapping<$t>) {
*self = *self & other;
}
Expand All @@ -298,7 +298,7 @@ macro_rules! wrapping_impl {
#[stable(feature = "wrapping_neg", since = "1.10.0")]
impl Neg for Wrapping<$t> {
type Output = Self;
#[inline(always)]
#[inline]
fn neg(self) -> Self {
Wrapping(0) - self
}
Expand Down
4 changes: 2 additions & 2 deletions src/libcore/ptr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ pub unsafe fn replace<T>(dest: *mut T, mut src: T) -> T {
/// assert_eq!(std::ptr::read(y), 12);
/// }
/// ```
#[inline(always)]
#[inline]
#[stable(feature = "rust1", since = "1.0.0")]
pub unsafe fn read<T>(src: *const T) -> T {
let mut tmp: T = mem::uninitialized();
Expand Down Expand Up @@ -278,7 +278,7 @@ pub unsafe fn read<T>(src: *const T) -> T {
/// assert_eq!(std::ptr::read_unaligned(y), 12);
/// }
/// ```
#[inline(always)]
#[inline]
#[stable(feature = "ptr_unaligned", since = "1.17.0")]
pub unsafe fn read_unaligned<T>(src: *const T) -> T {
let mut tmp: T = mem::uninitialized();
Expand Down
2 changes: 1 addition & 1 deletion src/libcore/slice/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1105,7 +1105,7 @@ impl<'a, T> IntoIterator for &'a mut [T] {
}
}

#[inline(always)]
#[inline]
fn size_from_ptr<T>(_: *const T) -> usize {
mem::size_of::<T>()
}
Expand Down
Loading