4436c9d354
This commit applies rustfmt with rust-lang/rust's default settings to files in src/libstd *that are not involved in any currently open PR* to minimize merge conflicts. THe list of files involved in open PRs was determined by querying GitHub's GraphQL API with this script: https://gist.github.com/dtolnay/aa9c34993dc051a4f344d1b10e4487e8 With the list of files from the script in outstanding_files, the relevant commands were: $ find src/libstd -name '*.rs' \ | xargs rustfmt --edition=2018 --unstable-features --skip-children $ rg libstd outstanding_files | xargs git checkout -- Repeating this process several months apart should get us coverage of most of the rest of libstd. To confirm no funny business: $ git checkout $THIS_COMMIT^ $ git show --pretty= --name-only $THIS_COMMIT \ | xargs rustfmt --edition=2018 --unstable-features --skip-children $ git diff $THIS_COMMIT # there should be no difference
45 lines
1.2 KiB
Rust
45 lines
1.2 KiB
Rust
#![allow(dead_code)]
|
|
|
|
use crate::alloc::{GlobalAlloc, Layout, System};
|
|
use crate::cmp;
|
|
use crate::ptr;
|
|
|
|
// The minimum alignment guaranteed by the architecture. This value is used to
|
|
// add fast paths for low alignment values.
|
|
#[cfg(all(any(
|
|
target_arch = "x86",
|
|
target_arch = "arm",
|
|
target_arch = "mips",
|
|
target_arch = "powerpc",
|
|
target_arch = "powerpc64",
|
|
target_arch = "asmjs",
|
|
target_arch = "wasm32",
|
|
target_arch = "hexagon"
|
|
)))]
|
|
pub const MIN_ALIGN: usize = 8;
|
|
#[cfg(all(any(
|
|
target_arch = "x86_64",
|
|
target_arch = "aarch64",
|
|
target_arch = "mips64",
|
|
target_arch = "s390x",
|
|
target_arch = "sparc64"
|
|
)))]
|
|
pub const MIN_ALIGN: usize = 16;
|
|
|
|
pub unsafe fn realloc_fallback(
|
|
alloc: &System,
|
|
ptr: *mut u8,
|
|
old_layout: Layout,
|
|
new_size: usize,
|
|
) -> *mut u8 {
|
|
// Docs for GlobalAlloc::realloc require this to be valid:
|
|
let new_layout = Layout::from_size_align_unchecked(new_size, old_layout.align());
|
|
|
|
let new_ptr = GlobalAlloc::alloc(alloc, new_layout);
|
|
if !new_ptr.is_null() {
|
|
let size = cmp::min(old_layout.size(), new_size);
|
|
ptr::copy_nonoverlapping(ptr, new_ptr, size);
|
|
GlobalAlloc::dealloc(alloc, ptr, old_layout);
|
|
}
|
|
new_ptr
|
|
}
|