Update to rustfmt-preview (#348)

* Update to rustfmt-preview.

* Run "cargo fmt --all" with rustfmt 0.4.1.

rustfmt 0.4.1 is the latest release of rustfmt-preview available on the
stable channel.

* Fix a long line that rustfmt 0.4.1 can't handle.

* Remove unneeded commas left behind by rustfmt.
This commit is contained in:
Dan Gohman
2018-05-25 11:38:38 -07:00
committed by GitHub
parent 99f6055c55
commit 6b88cd44a8
137 changed files with 1914 additions and 2380 deletions

View File

@@ -1,8 +1,8 @@
use std::mem;
use std::ptr;
use errno;
use libc;
use region;
use std::mem;
use std::ptr;
/// Round `size` up to the nearest multiple of `page_size`.
fn round_up_to_page_size(size: usize, page_size: usize) -> usize {
@@ -91,10 +91,8 @@ impl Memory {
}
fn finish_current(&mut self) {
self.allocations.push(mem::replace(
&mut self.current,
PtrLen::new(),
));
self.allocations
.push(mem::replace(&mut self.current, PtrLen::new()));
self.position = 0;
}
@@ -136,9 +134,8 @@ impl Memory {
for &PtrLen { ptr, len } in &self.allocations[self.executable..] {
if len != 0 {
unsafe {
region::protect(ptr, len, region::Protection::Read).expect(
"unable to make memory readonly",
);
region::protect(ptr, len, region::Protection::Read)
.expect("unable to make memory readonly");
}
}
}