Skip to content

Commit

Permalink
fixup! libstd: Always inline all byteswap functions
Browse files Browse the repository at this point in the history
  • Loading branch information
@c-a
c-a committed Jan 2, 2014
1 parent 1749d61 commit a82f32b
Showing 1 changed file with 27 additions and 27 deletions.
54 changes: 27 additions & 27 deletions src/libstd/unstable/intrinsics.rs
View file
Expand Up @@ -486,33 +486,33 @@ extern "rust-intrinsic" {
pub fn u64_mul_with_overflow(x: u64, y: u64) -> (u64, bool);
}

#[cfg(target_endian = "little")] #[inline(always)] pub fn to_le16(x: i16) -> i16 { x }
#[cfg(target_endian = "big")] #[inline(always)] pub fn to_le16(x: i16) -> i16 { unsafe { bswap16(x) } }
#[cfg(target_endian = "little")] #[inline(always)] pub fn to_le32(x: i32) -> i32 { x }
#[cfg(target_endian = "big")] #[inline(always)] pub fn to_le32(x: i32) -> i32 { unsafe { bswap32(x) } }
#[cfg(target_endian = "little")] #[inline(always)] pub fn to_le64(x: i64) -> i64 { x }
#[cfg(target_endian = "big")] #[inline(always)] pub fn to_le64(x: i64) -> i64 { unsafe { bswap64(x) } }

#[cfg(target_endian = "little")] #[inline(always)] pub fn to_be16(x: i16) -> i16 { unsafe { bswap16(x) } }
#[cfg(target_endian = "big")] #[inline(always)] pub fn to_be16(x: i16) -> i16 { x }
#[cfg(target_endian = "little")] #[inline(always)] pub fn to_be32(x: i32) -> i32 { unsafe { bswap32(x) } }
#[cfg(target_endian = "big")] #[inline(always)] pub fn to_be32(x: i32) -> i32 { x }
#[cfg(target_endian = "little")] #[inline(always)] pub fn to_be64(x: i64) -> i64 { unsafe { bswap64(x) } }
#[cfg(target_endian = "big")] #[inline(always)] pub fn to_be64(x: i64) -> i64 { x }

#[cfg(target_endian = "little")] #[inline(always)] pub fn from_le16(x: i16) -> i16 { x }
#[cfg(target_endian = "big")] #[inline(always)] pub fn from_le16(x: i16) -> i16 { unsafe { bswap16(x) } }
#[cfg(target_endian = "little")] #[inline(always)] pub fn from_le32(x: i32) -> i32 { x }
#[cfg(target_endian = "big")] #[inline(always)] pub fn from_le32(x: i32) -> i32 { unsafe { bswap32(x) } }
#[cfg(target_endian = "little")] #[inline(always)] pub fn from_le64(x: i64) -> i64 { x }
#[cfg(target_endian = "big")] #[inline(always)] pub fn from_le64(x: i64) -> i64 { unsafe { bswap64(x) } }

#[cfg(target_endian = "little")] #[inline(always)] pub fn from_be16(x: i16) -> i16 { unsafe { bswap16(x) } }
#[cfg(target_endian = "big")] #[inline(always)] pub fn from_be16(x: i16) -> i16 { x }
#[cfg(target_endian = "little")] #[inline(always)] pub fn from_be32(x: i32) -> i32 { unsafe { bswap32(x) } }
#[cfg(target_endian = "big")] #[inline(always)] pub fn from_be32(x: i32) -> i32 { x }
#[cfg(target_endian = "little")] #[inline(always)] pub fn from_be64(x: i64) -> i64 { unsafe { bswap64(x) } }
#[cfg(target_endian = "big")] #[inline(always)] pub fn from_be64(x: i64) -> i64 { x }
#[cfg(target_endian = "little")] #[inline] pub fn to_le16(x: i16) -> i16 { x }
#[cfg(target_endian = "big")] #[inline] pub fn to_le16(x: i16) -> i16 { unsafe { bswap16(x) } }
#[cfg(target_endian = "little")] #[inline] pub fn to_le32(x: i32) -> i32 { x }
#[cfg(target_endian = "big")] #[inline] pub fn to_le32(x: i32) -> i32 { unsafe { bswap32(x) } }
#[cfg(target_endian = "little")] #[inline] pub fn to_le64(x: i64) -> i64 { x }
#[cfg(target_endian = "big")] #[inline] pub fn to_le64(x: i64) -> i64 { unsafe { bswap64(x) } }

#[cfg(target_endian = "little")] #[inline] pub fn to_be16(x: i16) -> i16 { unsafe { bswap16(x) } }
#[cfg(target_endian = "big")] #[inline] pub fn to_be16(x: i16) -> i16 { x }
#[cfg(target_endian = "little")] #[inline] pub fn to_be32(x: i32) -> i32 { unsafe { bswap32(x) } }
#[cfg(target_endian = "big")] #[inline] pub fn to_be32(x: i32) -> i32 { x }
#[cfg(target_endian = "little")] #[inline] pub fn to_be64(x: i64) -> i64 { unsafe { bswap64(x) } }
#[cfg(target_endian = "big")] #[inline] pub fn to_be64(x: i64) -> i64 { x }

#[cfg(target_endian = "little")] #[inline] pub fn from_le16(x: i16) -> i16 { x }
#[cfg(target_endian = "big")] #[inline] pub fn from_le16(x: i16) -> i16 { unsafe { bswap16(x) } }
#[cfg(target_endian = "little")] #[inline] pub fn from_le32(x: i32) -> i32 { x }
#[cfg(target_endian = "big")] #[inline] pub fn from_le32(x: i32) -> i32 { unsafe { bswap32(x) } }
#[cfg(target_endian = "little")] #[inline] pub fn from_le64(x: i64) -> i64 { x }
#[cfg(target_endian = "big")] #[inline] pub fn from_le64(x: i64) -> i64 { unsafe { bswap64(x) } }

#[cfg(target_endian = "little")] #[inline] pub fn from_be16(x: i16) -> i16 { unsafe { bswap16(x) } }
#[cfg(target_endian = "big")] #[inline] pub fn from_be16(x: i16) -> i16 { x }
#[cfg(target_endian = "little")] #[inline] pub fn from_be32(x: i32) -> i32 { unsafe { bswap32(x) } }
#[cfg(target_endian = "big")] #[inline] pub fn from_be32(x: i32) -> i32 { x }
#[cfg(target_endian = "little")] #[inline] pub fn from_be64(x: i64) -> i64 { unsafe { bswap64(x) } }
#[cfg(target_endian = "big")] #[inline] pub fn from_be64(x: i64) -> i64 { x }

/// `TypeId` represents a globally unique identifier for a type
#[lang="type_id"] // This needs to be kept in lockstep with the code in trans/intrinsic.rs and
Expand Down

9 comments on commit a82f32b

@bors
Copy link
Contributor

@bors bors commented on a82f32b Jan 4, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from brson
at c-a@a82f32b

@bors
Copy link
Contributor

@bors bors commented on a82f32b Jan 4, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging c-a/rust/inline_byteswap = a82f32b into auto

@bors
Copy link
Contributor

@bors bors commented on a82f32b Jan 4, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

c-a/rust/inline_byteswap = a82f32b merged ok, testing candidate = 7fe0c784

@bors
Copy link
Contributor

@bors bors commented on a82f32b Jan 4, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

some tests failed:
failure: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/2461
exception: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/3347
exception: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-c/builds/1190
exception: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-t/builds/1193
exception: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/3350
exception: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/2452
exception: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/2455
exception: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/3366
exception: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/2455
exception: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/2460
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/3368
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/2455
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/2459
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android/builds/2529
exception: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/3355
exception: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/2457
exception: http://buildbot.rust-lang.org/builders/auto-bsd-64-opt/builds/3129

@bors
Copy link
Contributor

@bors bors commented on a82f32b Jan 4, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from brson
at c-a@a82f32b

@bors
Copy link
Contributor

@bors bors commented on a82f32b Jan 4, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging c-a/rust/inline_byteswap = a82f32b into auto

@bors
Copy link
Contributor

@bors bors commented on a82f32b Jan 4, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

c-a/rust/inline_byteswap = a82f32b merged ok, testing candidate = 0ff6c12

@bors
Copy link
Contributor

@bors bors commented on a82f32b Jan 4, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all tests pass:
success: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/3350
success: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-c/builds/1193
success: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-t/builds/1196
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/3353
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/2455
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/2458
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/3369
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/2458
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/2463
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/3371
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/2458
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/2462
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android/builds/2532
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/3358
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/2460
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/2464
success: http://buildbot.rust-lang.org/builders/auto-bsd-64-opt/builds/3132

@bors
Copy link
Contributor

@bors bors commented on a82f32b Jan 4, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 0ff6c12

Please sign in to comment.