diff options
| author | bors <bors@rust-lang.org> | 2017-03-17 11:55:34 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-03-17 11:55:34 +0000 |
| commit | f77ee2ff0ff93a3af205e4fa564f9f52cc066009 (patch) | |
| tree | 25b666a12b904aa9ed6d1dfc812b2a7b16c68b06 /src/libstd | |
| parent | b3234cd4272b97894d349434415afeb1c0d04f8e (diff) | |
| parent | 0739ecec618dc15332e1588a560ea449d4547d5e (diff) | |
| download | rust-f77ee2ff0ff93a3af205e4fa564f9f52cc066009.tar.gz rust-f77ee2ff0ff93a3af205e4fa564f9f52cc066009.zip | |
Auto merge of #40539 - clarcharr:no_default_path, r=alexcrichton
Removes Default for Box<Path>. This was not supposed to be added. cc @alexcrichton
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/path.rs | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/libstd/path.rs b/src/libstd/path.rs index 49b01bc0853..b524af800c1 100644 --- a/src/libstd/path.rs +++ b/src/libstd/path.rs @@ -1224,14 +1224,6 @@ impl Into<Box<Path>> for PathBuf { } } -#[stable(feature = "box_default_extra", since = "1.17.0")] -impl Default for Box<Path> { - fn default() -> Box<Path> { - let boxed: Box<OsStr> = Default::default(); - unsafe { mem::transmute(boxed) } - } -} - #[stable(feature = "rust1", since = "1.0.0")] impl<'a, T: ?Sized + AsRef<OsStr>> From<&'a T> for PathBuf { fn from(s: &'a T) -> PathBuf { @@ -3730,10 +3722,4 @@ mod tests { assert_eq!(&*boxed, &*path_buf); assert_eq!(&*path_buf, path); } - - #[test] - fn boxed_default() { - let boxed = <Box<Path>>::default(); - assert!(boxed.as_os_str().is_empty()); - } } |
