Skip to content

Commit

Permalink
edition 2018
Browse files Browse the repository at this point in the history
  • Loading branch information
klensy committed Aug 7, 2023
1 parent efd227f commit fdc1a87
Show file tree
Hide file tree
Showing 17 changed files with 32 additions and 30 deletions.
1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ readme = "README.md"
repository = "https://github.com/rust-lang/compiler-builtins"
homepage = "https://github.com/rust-lang/compiler-builtins"
documentation = "https://docs.rs/compiler_builtins"
edition = "2018"
description = """
Compiler intrinsics used by the Rust compiler. Also available for other targets
if necessary!
Expand Down
6 changes: 3 additions & 3 deletions src/arm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ intrinsics! {
#[weak]
#[cfg(not(target_os = "ios"))]
pub unsafe extern "aapcs" fn __aeabi_memcpy(dest: *mut u8, src: *const u8, n: usize) {
::mem::memcpy(dest, src, n);
crate::mem::memcpy(dest, src, n);
}

#[weak]
Expand Down Expand Up @@ -121,7 +121,7 @@ intrinsics! {
#[weak]
#[cfg(not(target_os = "ios"))]
pub unsafe extern "aapcs" fn __aeabi_memmove(dest: *mut u8, src: *const u8, n: usize) {
::mem::memmove(dest, src, n);
crate::mem::memmove(dest, src, n);
}

#[weak]
Expand All @@ -140,7 +140,7 @@ intrinsics! {
#[cfg(not(target_os = "ios"))]
pub unsafe extern "aapcs" fn __aeabi_memset(dest: *mut u8, n: usize, c: i32) {
// Note the different argument order
::mem::memset(dest, c, n);
crate::mem::memset(dest, c, n);
}

#[weak]
Expand Down
4 changes: 2 additions & 2 deletions src/float/add.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use float::Float;
use int::{CastInto, Int};
use crate::float::Float;
use crate::int::{CastInto, Int};

/// Returns `a + b`
fn add<F: Float>(a: F, b: F) -> F
Expand Down
4 changes: 2 additions & 2 deletions src/float/cmp.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#![allow(unreachable_code)]

use float::Float;
use int::Int;
use crate::float::Float;
use crate::int::Int;

#[derive(Clone, Copy)]
enum Result {
Expand Down
4 changes: 2 additions & 2 deletions src/float/div.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// `return`s makes it clear where function exit points are
#![allow(clippy::needless_return)]

use float::Float;
use int::{CastInto, DInt, HInt, Int};
use crate::float::Float;
use crate::int::{CastInto, DInt, HInt, Int};

fn div32<F: Float>(a: F, b: F) -> F
where
Expand Down
4 changes: 2 additions & 2 deletions src/float/extend.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use float::Float;
use int::{CastInto, Int};
use crate::float::Float;
use crate::int::{CastInto, Int};

/// Generic conversion from a narrower to a wider IEEE-754 floating-point type
fn extend<F: Float, R: Float>(a: F) -> R
Expand Down
4 changes: 2 additions & 2 deletions src/float/mul.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use float::Float;
use int::{CastInto, DInt, HInt, Int};
use crate::float::Float;
use crate::int::{CastInto, DInt, HInt, Int};

fn mul<F: Float>(a: F, b: F) -> F
where
Expand Down
4 changes: 2 additions & 2 deletions src/float/pow.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use float::Float;
use int::Int;
use crate::float::Float;
use crate::int::Int;

/// Returns `a` raised to the power `b`
fn pow<F: Float>(a: F, b: i32) -> F {
Expand Down
6 changes: 3 additions & 3 deletions src/float/sub.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use float::add::__adddf3;
use float::add::__addsf3;
use float::Float;
use crate::float::add::__adddf3;
use crate::float::add::__addsf3;
use crate::float::Float;

intrinsics! {
#[arm_aeabi_alias = __aeabi_fsub]
Expand Down
4 changes: 2 additions & 2 deletions src/float/trunc.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use float::Float;
use int::{CastInto, Int};
use crate::float::Float;
use crate::int::{CastInto, Int};

fn trunc<F: Float, R: Float>(a: F) -> R
where
Expand Down
2 changes: 1 addition & 1 deletion src/int/addsub.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use int::{DInt, Int};
use crate::int::{DInt, Int};

trait UAddSub: DInt {
fn uadd(self, other: Self) -> Self {
Expand Down
2 changes: 1 addition & 1 deletion src/int/mul.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use int::{DInt, HInt, Int};
use crate::int::{DInt, HInt, Int};

trait Mul: DInt
where
Expand Down
2 changes: 1 addition & 1 deletion src/int/sdiv.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use int::udiv::*;
use crate::int::udiv::*;

macro_rules! sdivmod {
(
Expand Down
2 changes: 1 addition & 1 deletion src/int/shift.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use int::{DInt, HInt, Int};
use crate::int::{DInt, HInt, Int};

trait Ashl: DInt {
/// Returns `a << b`, requires `b < Self::BITS`
Expand Down
4 changes: 2 additions & 2 deletions src/int/udiv.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#[cfg(not(feature = "public-test-deps"))]
pub(crate) use int::specialized_div_rem::*;
pub(crate) use crate::int::specialized_div_rem::*;

#[cfg(feature = "public-test-deps")]
pub use int::specialized_div_rem::*;
pub use crate::int::specialized_div_rem::*;

intrinsics! {
#[maybe_use_optimized_c_shim]
Expand Down
8 changes: 4 additions & 4 deletions src/macros.rs
Original file line number Diff line number Diff line change
Expand Up @@ -321,10 +321,10 @@ macro_rules! intrinsics {
#[cfg_attr(not(feature = "mangled-names"), no_mangle)]
#[cfg_attr(feature = "weak-intrinsics", linkage = "weak")]
pub extern $abi fn $name( $($argname: $ty),* )
-> ::macros::win64_128bit_abi_hack::U64x2
-> $crate::macros::win64_128bit_abi_hack::U64x2
{
let e: $($ret)? = super::$name($($argname),*);
::macros::win64_128bit_abi_hack::U64x2::from(e)
$crate::macros::win64_128bit_abi_hack::U64x2::from(e)
}
}

Expand Down Expand Up @@ -540,15 +540,15 @@ pub mod win64_128bit_abi_hack {

impl From<i128> for U64x2 {
fn from(i: i128) -> U64x2 {
use int::DInt;
use crate::int::DInt;
let j = i as u128;
U64x2(j.lo(), j.hi())
}
}

impl From<u128> for U64x2 {
fn from(i: u128) -> U64x2 {
use int::DInt;
use crate::int::DInt;
U64x2(i.lo(), i.hi())
}
}
Expand Down
1 change: 1 addition & 0 deletions src/math.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#[path = "../libm/src/math/mod.rs"]
mod libm;

#[allow(unused_macros)]
macro_rules! no_mangle {
($(fn $fun:ident($($iid:ident : $ity:ty),+) -> $oty:ty;)+) => {
intrinsics! {
Expand Down

0 comments on commit fdc1a87

Please sign in to comment.