Skip to content

Commit 520b642

Browse files
borsgitbot
authored and
gitbot
committed
Auto merge of rust-lang#134052 - matthiaskrgr:rollup-puxwqrk, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - rust-lang#133567 (A bunch of cleanups) - rust-lang#133789 (Add doc alias 'then_with' for `then` method on `bool`) - rust-lang#133880 (Expand home_dir docs) - rust-lang#134036 (crash tests: use individual mir opts instead of mir-opt-level where easily possible) - rust-lang#134045 (Fix some triagebot mentions paths) - rust-lang#134046 (Remove ignored tests for hangs w/ new solver) - rust-lang#134050 (Miri subtree update) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 5e1e35b + ea7c8d1 commit 520b642

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

core/src/bool.rs

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ impl bool {
5454
/// // `then`.
5555
/// assert_eq!(a, 1);
5656
/// ```
57+
#[doc(alias = "then_with")]
5758
#[stable(feature = "lazy_bool_to_option", since = "1.50.0")]
5859
#[cfg_attr(not(test), rustc_diagnostic_item = "bool_then")]
5960
#[inline]

std/src/env.rs

+7
Original file line numberDiff line numberDiff line change
@@ -597,6 +597,13 @@ impl Error for JoinPathsError {
597597

598598
/// Returns the path of the current user's home directory if known.
599599
///
600+
/// This may return `None` if getting the directory fails or if the platform does not have user home directories.
601+
///
602+
/// For storing user data and configuration it is often preferable to use more specific directories.
603+
/// For example, [XDG Base Directories] on Unix or the `LOCALAPPDATA` and `APPDATA` environment variables on Windows.
604+
///
605+
/// [XDG Base Directories]: https://specifications.freedesktop.org/basedir-spec/latest/
606+
///
600607
/// # Unix
601608
///
602609
/// - Returns the value of the 'HOME' environment variable if it is set

0 commit comments

Comments
 (0)