diff options
| -rw-r--r-- | src/libstd/path/windows.rs | 6 | ||||
| -rw-r--r-- | src/libstd/str.rs | 8 |
2 files changed, 3 insertions, 11 deletions
diff --git a/src/libstd/path/windows.rs b/src/libstd/path/windows.rs index 33fa84c7c49..666b8977cc9 100644 --- a/src/libstd/path/windows.rs +++ b/src/libstd/path/windows.rs @@ -154,7 +154,7 @@ impl GenericPathUnsafe for Path { /// /// # Failure /// - /// Raises the `str::not_utf8` condition if not valid UTF-8. + /// Fails if not valid UTF-8. #[inline] unsafe fn new_unchecked<T: BytesContainer>(path: T) -> Path { let (prefix, path) = Path::normalize_(path.container_as_str().unwrap()); @@ -168,7 +168,7 @@ impl GenericPathUnsafe for Path { /// /// # Failure /// - /// Raises the `str::not_utf8` condition if not valid UTF-8. + /// Fails if not valid UTF-8. unsafe fn set_filename_unchecked<T: BytesContainer>(&mut self, filename: T) { let filename = filename.container_as_str().unwrap(); match self.sepidx_or_prefix_len() { @@ -591,7 +591,7 @@ impl Path { /// # Failure /// /// Raises the `null_byte` condition if the vector contains a NUL. - /// Raises the `str::not_utf8` condition if invalid UTF-8. + /// Fails if invalid UTF-8. #[inline] pub fn new<T: BytesContainer>(path: T) -> Path { GenericPath::new(path) diff --git a/src/libstd/str.rs b/src/libstd/str.rs index 6d52e94064c..95a02e1631a 100644 --- a/src/libstd/str.rs +++ b/src/libstd/str.rs @@ -118,14 +118,6 @@ use send_str::{SendStr, SendStrOwned}; use unstable::raw::Repr; /* -Section: Conditions -*/ - -condition! { - pub not_utf8: (~str) -> ~str; -} - -/* Section: Creating a string */ |