Merge pull request #79 from RalfJung/rustup

Fix for Rust changes
pull/77/merge
Steve Klabnik 6 years ago committed by GitHub
commit 66ef737340
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -6,7 +6,7 @@ rust:
- nightly
before_script:
- (cargo install mdbook --force || true)
- (cargo install mdbook --force --vers "0.1.7" || true)
script:
- export PATH=$PATH:/home/travis/.cargo/bin;

@ -9,7 +9,7 @@ use std::ptr::{Unique, NonNull, self};
use std::mem;
use std::ops::{Deref, DerefMut};
use std::marker::PhantomData;
use std::alloc::{Alloc, GlobalAlloc, Layout, Global, oom};
use std::alloc::{Alloc, GlobalAlloc, Layout, Global, handle_alloc_error};
struct RawVec<T> {
ptr: Unique<T>,
@ -47,7 +47,7 @@ impl<T> RawVec<T> {
// If allocate or reallocate fail, oom
if ptr.is_err() {
oom(Layout::from_size_align_unchecked(
handle_alloc_error(Layout::from_size_align_unchecked(
new_cap * elem_size,
mem::align_of::<T>(),
))

Loading…
Cancel
Save