nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-06 20:28:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix fallout from #57667

Browse Source
This commit is contained in:
ishitatsuyuki 2019-01-31 18:28:22 +09:00
parent 0f949c2fcc
commit a03e20db6d
1 changed files with 6 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/libsyntax/ptr.rs
View File

@ -29,7 +29,7 @@
use std::fmt::{self, Display, Debug}; use std::fmt::{self, Display, Debug};
use std::iter::FromIterator; use std::iter::FromIterator;
use std::ops::{Deref, DerefMut}; use std::ops::{Deref, DerefMut};
use std::{mem, ptr, slice, vec}; use std::{slice, vec};
use serialize::{Encodable, Decodable, Encoder, Decoder}; use serialize::{Encodable, Decodable, Encoder, Decoder};
@ -66,45 +66,18 @@ impl<T: 'static> P<T> {
pub fn map<F>(mut self, f: F) -> P<T> where pub fn map<F>(mut self, f: F) -> P<T> where
F: FnOnce(T) -> T, F: FnOnce(T) -> T,
{ {
let p: *mut T = &mut *self.ptr; let x = f(*self.ptr);
*self.ptr = x;
// Leak self in case of panic. self
// FIXME(eddyb) Use some sort of "free guard" that
// only deallocates, without dropping the pointee,
// in case the call the `f` below ends in a panic.
mem::forget(self);
unsafe {
ptr::write(p, f(ptr::read(p)));
// Recreate self from the raw pointer.
P { ptr: Box::from_raw(p) }
}
} }
/// Optionally produce a new `P<T>` from `self` without reallocating. /// Optionally produce a new `P<T>` from `self` without reallocating.
pub fn filter_map<F>(mut self, f: F) -> Option<P<T>> where pub fn filter_map<F>(mut self, f: F) -> Option<P<T>> where
F: FnOnce(T) -> Option<T>, F: FnOnce(T) -> Option<T>,
{ {
let p: *mut T = &mut *self.ptr; *self.ptr = f(*self.ptr)?;
Some(self)
// Leak self in case of panic.
// FIXME(eddyb) Use some sort of "free guard" that
// only deallocates, without dropping the pointee,
// in case the call the `f` below ends in a panic.
mem::forget(self);
unsafe {
if let Some(v) = f(ptr::read(p)) {
ptr::write(p, v);
// Recreate self from the raw pointer.
Some(P { ptr: Box::from_raw(p) })
} else {
drop(Box::from_raw(p));
None
}
}
} }
} }