Auto merge of #40598 - frewsxcv:rollup, r=frewsxcv
Rollup of 23 pull requests - Successful merges: #40387, #40433, #40452, #40456, #40457, #40458, #40463, #40466, #40467, #40495, #40496, #40497, #40499, #40500, #40503, #40505, #40512, #40514, #40517, #40520, #40536, #40545, #40586 - Failed merges:
This commit is contained in:
@@ -1065,13 +1065,13 @@ impl PathBuf {
|
||||
self.inner.push(path);
|
||||
}
|
||||
|
||||
/// Truncate `self` to [`self.parent()`].
|
||||
/// Truncate `self` to [`self.parent`].
|
||||
///
|
||||
/// Returns false and does nothing if [`self.file_name()`] is `None`.
|
||||
/// Returns false and does nothing if [`self.file_name`] is `None`.
|
||||
/// Otherwise, returns `true`.
|
||||
///
|
||||
/// [`self.parent()`]: struct.PathBuf.html#method.parent
|
||||
/// [`self.file_name()`]: struct.PathBuf.html#method.file_name
|
||||
/// [`self.parent`]: struct.PathBuf.html#method.parent
|
||||
/// [`self.file_name`]: struct.PathBuf.html#method.file_name
|
||||
///
|
||||
/// # Examples
|
||||
///
|
||||
@@ -1096,12 +1096,12 @@ impl PathBuf {
|
||||
}
|
||||
}
|
||||
|
||||
/// Updates [`self.file_name()`] to `file_name`.
|
||||
/// Updates [`self.file_name`] to `file_name`.
|
||||
///
|
||||
/// If [`self.file_name()`] was [`None`], this is equivalent to pushing
|
||||
/// If [`self.file_name`] was [`None`], this is equivalent to pushing
|
||||
/// `file_name`.
|
||||
///
|
||||
/// [`self.file_name()`]: struct.PathBuf.html#method.file_name
|
||||
/// [`self.file_name`]: struct.PathBuf.html#method.file_name
|
||||
/// [`None`]: ../../std/option/enum.Option.html#variant.None
|
||||
///
|
||||
/// # Examples
|
||||
@@ -1130,15 +1130,15 @@ impl PathBuf {
|
||||
self.push(file_name);
|
||||
}
|
||||
|
||||
/// Updates [`self.extension()`] to `extension`.
|
||||
/// Updates [`self.extension`] to `extension`.
|
||||
///
|
||||
/// If [`self.file_name()`] is `None`, does nothing and returns `false`.
|
||||
/// If [`self.file_name`] is `None`, does nothing and returns `false`.
|
||||
///
|
||||
/// Otherwise, returns `true`; if [`self.extension()`] is [`None`], the
|
||||
/// Otherwise, returns `true`; if [`self.extension`] is [`None`], the
|
||||
/// extension is added; otherwise it is replaced.
|
||||
///
|
||||
/// [`self.file_name()`]: struct.PathBuf.html#method.file_name
|
||||
/// [`self.extension()`]: struct.PathBuf.html#method.extension
|
||||
/// [`self.file_name`]: struct.PathBuf.html#method.file_name
|
||||
/// [`self.extension`]: struct.PathBuf.html#method.extension
|
||||
/// [`None`]: ../../std/option/enum.Option.html#variant.None
|
||||
///
|
||||
/// # Examples
|
||||
@@ -1739,9 +1739,9 @@ impl Path {
|
||||
iter_after(self.components().rev(), child.components().rev()).is_some()
|
||||
}
|
||||
|
||||
/// Extracts the stem (non-extension) portion of [`self.file_name()`].
|
||||
/// Extracts the stem (non-extension) portion of [`self.file_name`].
|
||||
///
|
||||
/// [`self.file_name()`]: struct.Path.html#method.file_name
|
||||
/// [`self.file_name`]: struct.Path.html#method.file_name
|
||||
///
|
||||
/// The stem is:
|
||||
///
|
||||
@@ -1766,7 +1766,7 @@ impl Path {
|
||||
self.file_name().map(split_file_at_dot).and_then(|(before, after)| before.or(after))
|
||||
}
|
||||
|
||||
/// Extracts the extension of [`self.file_name()`], if possible.
|
||||
/// Extracts the extension of [`self.file_name`], if possible.
|
||||
///
|
||||
/// The extension is:
|
||||
///
|
||||
@@ -1775,7 +1775,7 @@ impl Path {
|
||||
/// * [`None`], if the file name begins with `.` and has no other `.`s within;
|
||||
/// * Otherwise, the portion of the file name after the final `.`
|
||||
///
|
||||
/// [`self.file_name()`]: struct.Path.html#method.file_name
|
||||
/// [`self.file_name`]: struct.Path.html#method.file_name
|
||||
/// [`None`]: ../../std/option/enum.Option.html#variant.None
|
||||
///
|
||||
/// # Examples
|
||||
|
||||
Reference in New Issue
Block a user