Auto merge of #131337 - matthiaskrgr:rollup-j37xn8o, r=matthiaskrgr
Rollup of 4 pull requests
Successful merges:
- #131001 (add clarity for custom path installation)
- #131307 (Android: Debug assertion after setting thread name)
- #131322 (Update out-dated link)
- #131335 (grammar fix)
r? `@ghost`
`@rustbot` modify labels: rollup
diff --git a/INSTALL.md b/INSTALL.md
index ded0b59..74fcc58 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -79,9 +79,23 @@
./configure
```
- If you plan to use `x.py install` to create an installation, it is
- recommended that you set the `prefix` value in the `[install]` section to a
- directory: `./configure --set install.prefix=<path>`
+ If you plan to use `x.py install` to create an installation, you can either
+ set `DESTDIR` environment variable to your custom directory path:
+
+ ```bash
+ export DESTDIR=<path>
+ ```
+
+ or set `prefix` and `sysconfdir` in the `[install]` section to your custom
+ directory path:
+
+ ```sh
+ ./configure --set install.prefix=<path> --set install.sysconfdir=<path>
+ ```
+
+ When the `DESTDIR` environment variable is present, the `prefix` and
+ `sysconfdir` values are combined with the path from the `DESTDIR`
+ environment variable.
3. Build and install:
diff --git a/compiler/rustc_driver_impl/README.md b/compiler/rustc_driver_impl/README.md
index 6d7fba3..9fa4242 100644
--- a/compiler/rustc_driver_impl/README.md
+++ b/compiler/rustc_driver_impl/README.md
@@ -7,4 +7,4 @@
For more information about how the driver works, see the [rustc dev guide].
-[rustc dev guide]: https://rustc-dev-guide.rust-lang.org/rustc-driver.html
+[rustc dev guide]: https://rustc-dev-guide.rust-lang.org/rustc-driver/intro.html
diff --git a/library/core/src/intrinsics/mir.rs b/library/core/src/intrinsics/mir.rs
index fb0aa53..a2ab39c 100644
--- a/library/core/src/intrinsics/mir.rs
+++ b/library/core/src/intrinsics/mir.rs
@@ -213,7 +213,7 @@
//! - All other locals need to be declared with `let` somewhere and then can be accessed by name.
//!
//! #### Places
-//! - Locals implicit convert to places.
+//! - Locals implicitly convert to places.
//! - Field accesses, derefs, and indexing work normally.
//! - Fields in variants can be accessed via the [`Variant`] and [`Field`] associated functions,
//! see their documentation for details.
diff --git a/library/std/src/sys/pal/unix/thread.rs b/library/std/src/sys/pal/unix/thread.rs
index 2f2d6e6..0402466 100644
--- a/library/std/src/sys/pal/unix/thread.rs
+++ b/library/std/src/sys/pal/unix/thread.rs
@@ -117,13 +117,15 @@ pub fn yield_now() {
pub fn set_name(name: &CStr) {
const PR_SET_NAME: libc::c_int = 15;
unsafe {
- libc::prctl(
+ let res = libc::prctl(
PR_SET_NAME,
name.as_ptr(),
0 as libc::c_ulong,
0 as libc::c_ulong,
0 as libc::c_ulong,
);
+ // We have no good way of propagating errors here, but in debug-builds let's check that this actually worked.
+ debug_assert_eq!(res, 0);
}
}
