diff options
| author | bors <bors@rust-lang.org> | 2014-11-14 18:17:28 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-11-14 18:17:28 +0000 |
| commit | 1e4e55aebc1a71b6674c00b8604efa6b1e2e52cd (patch) | |
| tree | d57cb32a69c139630345db9c9a52fda4bf900b6c /src/libstd/path | |
| parent | 1bf06495443584539b958873e04cc2f864ab10e4 (diff) | |
| parent | 5969bf663ef6ea4c62d27b88a957d401dad4227b (diff) | |
| download | rust-1e4e55aebc1a71b6674c00b8604efa6b1e2e52cd.tar.gz rust-1e4e55aebc1a71b6674c00b8604efa6b1e2e52cd.zip | |
auto merge of #18880 : barosl/rust/doc-fail-to-panic, r=alexcrichton
I found some occurrences of "failure" and "fails" in the documentation. I changed them to "panics" if it means a task panic. Otherwise I left it as is, or changed it to "errors" to clearly distinguish them. Also, I made a minor fix that is breaking the layout of a module page. "Example" is shown in an irrelevant place from the following page: http://doc.rust-lang.org/std/os/index.html
Diffstat (limited to 'src/libstd/path')
| -rw-r--r-- | src/libstd/path/mod.rs | 28 | ||||
| -rw-r--r-- | src/libstd/path/posix.rs | 4 | ||||
| -rw-r--r-- | src/libstd/path/windows.rs | 12 |
3 files changed, 22 insertions, 22 deletions
diff --git a/src/libstd/path/mod.rs b/src/libstd/path/mod.rs index e55933c4262..a185a29a700 100644 --- a/src/libstd/path/mod.rs +++ b/src/libstd/path/mod.rs @@ -154,9 +154,9 @@ pub trait GenericPath: Clone + GenericPathUnsafe { /// # } /// ``` /// - /// # Failure + /// # Panics /// - /// Fails the task if the path contains a NUL. + /// Panics the task if the path contains a NUL. /// /// See individual Path impls for additional restrictions. #[inline] @@ -443,9 +443,9 @@ pub trait GenericPath: Clone + GenericPathUnsafe { /// # } /// ``` /// - /// # Failure + /// # Panics /// - /// Fails the task if the filename contains a NUL. + /// Panics the task if the filename contains a NUL. #[inline] fn set_filename<T: BytesContainer>(&mut self, filename: T) { assert!(!contains_nul(&filename)); @@ -469,9 +469,9 @@ pub trait GenericPath: Clone + GenericPathUnsafe { /// # } /// ``` /// - /// # Failure + /// # Panics /// - /// Fails the task if the extension contains a NUL. + /// Panics the task if the extension contains a NUL. fn set_extension<T: BytesContainer>(&mut self, extension: T) { assert!(!contains_nul(&extension)); @@ -518,9 +518,9 @@ pub trait GenericPath: Clone + GenericPathUnsafe { /// # } /// ``` /// - /// # Failure + /// # Panics /// - /// Fails the task if the filename contains a NUL. + /// Panics the task if the filename contains a NUL. #[inline] fn with_filename<T: BytesContainer>(&self, filename: T) -> Self { let mut p = self.clone(); @@ -543,9 +543,9 @@ pub trait GenericPath: Clone + GenericPathUnsafe { /// # } /// ``` /// - /// # Failure + /// # Panics /// - /// Fails the task if the extension contains a NUL. + /// Panics the task if the extension contains a NUL. #[inline] fn with_extension<T: BytesContainer>(&self, extension: T) -> Self { let mut p = self.clone(); @@ -602,9 +602,9 @@ pub trait GenericPath: Clone + GenericPathUnsafe { /// # } /// ``` /// - /// # Failure + /// # Panics /// - /// Fails the task if the path contains a NUL. + /// Panics the task if the path contains a NUL. #[inline] fn push<T: BytesContainer>(&mut self, path: T) { assert!(!contains_nul(&path)); @@ -671,9 +671,9 @@ pub trait GenericPath: Clone + GenericPathUnsafe { /// # } /// ``` /// - /// # Failure + /// # Panics /// - /// Fails the task if the path contains a NUL. + /// Panics the task if the path contains a NUL. #[inline] fn join<T: BytesContainer>(&self, path: T) -> Self { let mut p = self.clone(); diff --git a/src/libstd/path/posix.rs b/src/libstd/path/posix.rs index 9918e939097..794f6978642 100644 --- a/src/libstd/path/posix.rs +++ b/src/libstd/path/posix.rs @@ -327,9 +327,9 @@ impl GenericPath for Path { impl Path { /// Returns a new Path from a byte vector or string /// - /// # Failure + /// # Panics /// - /// Fails the task if the vector contains a NUL. + /// Panics the task if the vector contains a NUL. #[inline] pub fn new<T: BytesContainer>(path: T) -> Path { GenericPath::new(path) diff --git a/src/libstd/path/windows.rs b/src/libstd/path/windows.rs index 3a5350f0a29..2da2159653e 100644 --- a/src/libstd/path/windows.rs +++ b/src/libstd/path/windows.rs @@ -159,9 +159,9 @@ impl BytesContainer for Path { impl GenericPathUnsafe for Path { /// See `GenericPathUnsafe::from_vec_unchecked`. /// - /// # Failure + /// # Panics /// - /// Fails if not valid UTF-8. + /// Panics 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()); @@ -173,9 +173,9 @@ impl GenericPathUnsafe for Path { /// See `GenericPathUnsafe::set_filename_unchecked`. /// - /// # Failure + /// # Panics /// - /// Fails if not valid UTF-8. + /// Panics 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() { @@ -600,9 +600,9 @@ impl GenericPath for Path { impl Path { /// Returns a new `Path` from a `BytesContainer`. /// - /// # Failure + /// # Panics /// - /// Fails if the vector contains a `NUL`, or if it contains invalid UTF-8. + /// Panics if the vector contains a `NUL`, or if it contains invalid UTF-8. /// /// # Example /// |
