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.

Sign up for GitHub

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

Build on latest nightly #2

Merged
merged 2 commits into from
Jun 6, 2017
Merged

Build on latest nightly #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27839d7
replaced get_mut
mortendahl Jun 6, 2017
3186ae2
replace get
mortendahl Jun 6, 2017
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
24 changes: 12 additions & 12 deletions src/int.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ impl Int {
pub fn from_single_limb(limb: Limb) -> Int {
let mut i = Int::with_capacity(1);
unsafe {
*i.ptr.get_mut() = limb;
*i.ptr.as_ptr() = limb;
}
i.size = 1;

Expand All @@ -155,7 +155,7 @@ impl Int {
fn with_raw_vec<F: FnOnce(&mut RawVec<Limb>)>(&mut self, f: F) {
unsafe {
let old_cap = self.cap as usize;
let mut vec = RawVec::from_raw_parts(self.ptr.get_mut(), old_cap);
let mut vec = RawVec::from_raw_parts(self.ptr.as_ptr(), old_cap);
// if `f` panics, let `vec` do the cleaning up, not self.
self.cap = 0;

Expand Down Expand Up @@ -221,7 +221,7 @@ impl Int {
if self.sign() == 0 {
return Limb(0);
} else {
return unsafe { *self.ptr.get() };
return unsafe { *self.ptr.as_ref() };
}
}

Expand Down Expand Up @@ -628,7 +628,7 @@ impl Int {
std::usize::MAX
} else {
let bytes = unsafe {
std::slice::from_raw_parts(self.ptr.get() as *const _ as *const u8,
std::slice::from_raw_parts(self.ptr.as_ref() as *const _ as *const u8,
self.abs_size() as usize * std::mem::size_of::<Limb>())
};
hamming::weight(bytes) as usize
Expand Down Expand Up @@ -737,18 +737,18 @@ impl Int {
// get a Limbs to all limbs currently initialised/in use
fn limbs(&self) -> Limbs {
unsafe {
Limbs::new(self.ptr.get(), 0, self.abs_size())
Limbs::new(self.ptr.as_ref(), 0, self.abs_size())
}
}
// get a LimbsMut to all limbs currently initialised/in use
fn limbs_mut(&mut self) -> LimbsMut {
unsafe {
LimbsMut::new(self.ptr.get_mut(), 0, self.abs_size())
LimbsMut::new(self.ptr.as_ptr(), 0, self.abs_size())
}
}
// get a LimbsMut to all allocated limbs
unsafe fn limbs_uninit(&mut self) -> LimbsMut {
LimbsMut::new(self.ptr.get_mut(), 0, self.cap as i32)
LimbsMut::new(self.ptr.as_ptr(), 0, self.cap as i32)
}

fn ensure_capacity(&mut self, cap: u32) {
Expand Down Expand Up @@ -784,7 +784,7 @@ impl Int {
let sign = self.sign();
unsafe {
while self.size != 0 &&
*self.ptr.offset((self.abs_size() - 1) as isize) == 0 {
*self.ptr.as_ptr().offset((self.abs_size() - 1) as isize) == 0 {

self.size -= sign;
}
Expand All @@ -804,7 +804,7 @@ impl Int {
}

let high_limb = unsafe {
*self.ptr.offset((self.abs_size() - 1) as isize)
*self.ptr.as_ptr().offset((self.abs_size() - 1) as isize)
};

return high_limb != 0;
Expand Down Expand Up @@ -976,7 +976,7 @@ impl Drop for Int {
fn drop(&mut self) {
if self.cap > 0 {
unsafe {
drop(RawVec::from_raw_parts(self.ptr.get_mut(),
drop(RawVec::from_raw_parts(self.ptr.as_ptr(),
self.cap as usize));
}
self.cap = 0;
Expand Down Expand Up @@ -3562,7 +3562,7 @@ macro_rules! impl_from_for_prim (
// Handle conversion where BaseInt = u32 and $t = i64
if i.abs_size() >= 2 { // Fallthrough if there's only one limb
let lower = i.to_single_limb().0 as $t;
let higher = unsafe { (*i.ptr.offset(1)).0 } as $t;
let higher = unsafe { (*i.ptr.as_ptr().offset(1)).0 } as $t;

// Combine the two
let n : $t = lower | higher.overflowing_shl(Limb::BITS as u32).0;
Expand Down Expand Up @@ -3590,7 +3590,7 @@ macro_rules! impl_from_for_prim (
// Handle conversion where BaseInt = u32 and $t = u64
if i.abs_size() >= 2 { // Fallthrough if there's only one limb
let lower = i.to_single_limb().0 as $t;
let higher = unsafe { (*i.ptr.offset(1)).0 } as $t;
let higher = unsafe { (*i.ptr.as_ptr().offset(1)).0 } as $t;

// Combine the two
let n : $t = lower | higher.overflowing_shl(Limb::BITS as u32).0;
Expand Down