diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2015-12-18 13:43:46 +0530 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2015-12-18 20:02:12 +0530 |
| commit | 9e953df6f05765679db074b8895ed2178d75eb26 (patch) | |
| tree | e71174db4adcf4adf1709afb41ff3fc125d5c35b /src/libsyntax/util | |
| parent | 158a1bdd7dac47356a0cc44dd52308c7145f4afe (diff) | |
| parent | 6c87b191580be9ecd5a99a34ef97375af0b9d659 (diff) | |
| download | rust-9e953df6f05765679db074b8895ed2178d75eb26.tar.gz rust-9e953df6f05765679db074b8895ed2178d75eb26.zip | |
Rollup merge of #30420 - petrochenkov:owned2, r=nrc
Part of https://github.com/rust-lang/rust/pull/30095 not causing mysterious segfaults. r? @nrc
Diffstat (limited to 'src/libsyntax/util')
| -rw-r--r-- | src/libsyntax/util/move_map.rs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/libsyntax/util/move_map.rs b/src/libsyntax/util/move_map.rs index 95c24c66630..e1078b719bf 100644 --- a/src/libsyntax/util/move_map.rs +++ b/src/libsyntax/util/move_map.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use owned_slice::OwnedSlice; - use std::ptr; pub trait MoveMap<T>: Sized { @@ -69,11 +67,11 @@ impl<T> MoveMap<T> for Vec<T> { } } -impl<T> MoveMap<T> for OwnedSlice<T> { +impl<T> MoveMap<T> for ::ptr::P<[T]> { fn move_flat_map<F, I>(self, f: F) -> Self where F: FnMut(T) -> I, I: IntoIterator<Item=T> { - OwnedSlice::from_vec(self.into_vec().move_flat_map(f)) + ::ptr::P::from_vec(self.into_vec().move_flat_map(f)) } } |