diff options
| author | bors <bors@rust-lang.org> | 2016-03-23 12:33:04 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-03-23 12:33:04 -0700 |
| commit | 98f0a9128f0fc6545de14a5de8f0e91675045e56 (patch) | |
| tree | 07e04a07ac24db795165e0fa2f62c65797d5c57e /src/libstd/ffi | |
| parent | b76f818cad31c7910fb6f0fa5e628dbaf4db1108 (diff) | |
| parent | 2e9b40f57638303d81eb9731784732e6491f0082 (diff) | |
| download | rust-98f0a9128f0fc6545de14a5de8f0e91675045e56.tar.gz rust-98f0a9128f0fc6545de14a5de8f0e91675045e56.zip | |
Auto merge of #32454 - eddyb:rollup, r=eddyb
Rollup of 11 pull requests - Successful merges: #32404, #32420, #32423, #32425, #32429, #32430, #32431, #32434, #32437, #32441, #32443 - Failed merges:
Diffstat (limited to 'src/libstd/ffi')
| -rw-r--r-- | src/libstd/ffi/os_str.rs | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/src/libstd/ffi/os_str.rs b/src/libstd/ffi/os_str.rs index 46f2d3a6418..de840457a01 100644 --- a/src/libstd/ffi/os_str.rs +++ b/src/libstd/ffi/os_str.rs @@ -173,6 +173,14 @@ impl ops::Deref for OsString { } } +#[stable(feature = "osstring_default", since = "1.9.0")] +impl Default for OsString { + #[inline] + fn default() -> OsString { + OsString::new() + } +} + #[stable(feature = "rust1", since = "1.0.0")] impl Debug for OsString { fn fmt(&self, formatter: &mut fmt::Formatter) -> Result<(), fmt::Error> { @@ -302,6 +310,14 @@ impl OsStr { } } +#[stable(feature = "osstring_default", since = "1.9.0")] +impl<'a> Default for &'a OsStr { + #[inline] + fn default() -> &'a OsStr { + OsStr::new("") + } +} + #[stable(feature = "rust1", since = "1.0.0")] impl PartialEq for OsStr { fn eq(&self, other: &OsStr) -> bool { @@ -555,6 +571,12 @@ mod tests { } #[test] + fn test_os_string_default() { + let os_string: OsString = Default::default(); + assert_eq!("", &os_string); + } + + #[test] fn test_os_str_is_empty() { let mut os_string = OsString::new(); assert!(os_string.is_empty()); @@ -577,4 +599,10 @@ mod tests { os_string.clear(); assert_eq!(0, os_string.len()); } + + #[test] + fn test_os_str_default() { + let os_str: &OsStr = Default::default(); + assert_eq!("", os_str); + } } |
