Skip to content

Commit c15d489

Browse files
author
The Miri Cronjob Bot
committed
Merge from rustc
2 parents 2c1bd02 + 2819604 commit c15d489

File tree

2 files changed

+19
-7
lines changed

2 files changed

+19
-7
lines changed

core/src/fmt/mod.rs

+10-2
Original file line numberDiff line numberDiff line change
@@ -975,9 +975,17 @@ pub trait UpperHex {
975975
/// `p` formatting.
976976
///
977977
/// The `Pointer` trait should format its output as a memory location. This is commonly presented
978-
/// as hexadecimal.
978+
/// as hexadecimal. For more information on formatters, see [the module-level documentation][module].
979979
///
980-
/// For more information on formatters, see [the module-level documentation][module].
980+
/// Printing of pointers is not a reliable way to discover how Rust programs are implemented.
981+
/// The act of reading an address changes the program itself, and may change how the data is represented
982+
/// in memory, and may affect which optimizations are applied to the code.
983+
///
984+
/// The printed pointer values are not guaranteed to be stable nor unique identifiers of objects.
985+
/// Rust allows moving values to different memory locations, and may reuse the same memory locations
986+
/// for different purposes.
987+
///
988+
/// There is no guarantee that the printed value can be converted back to a pointer.
981989
///
982990
/// [module]: ../../std/fmt/index.html
983991
///

std/src/process.rs

+9-5
Original file line numberDiff line numberDiff line change
@@ -1910,10 +1910,14 @@ impl crate::error::Error for ExitStatusError {}
19101910
/// to its parent under normal termination.
19111911
///
19121912
/// `ExitCode` is intended to be consumed only by the standard library (via
1913-
/// [`Termination::report()`]), and intentionally does not provide accessors like
1914-
/// `PartialEq`, `Eq`, or `Hash`. Instead the standard library provides the
1915-
/// canonical `SUCCESS` and `FAILURE` exit codes as well as `From<u8> for
1916-
/// ExitCode` for constructing other arbitrary exit codes.
1913+
/// [`Termination::report()`]). For forwards compatibility with potentially
1914+
/// unusual targets, this type currently does not provide `Eq`, `Hash`, or
1915+
/// access to the raw value. This type does provide `PartialEq` for
1916+
/// comparison, but note that there may potentially be multiple failure
1917+
/// codes, some of which will _not_ compare equal to `ExitCode::FAILURE`.
1918+
/// The standard library provides the canonical `SUCCESS` and `FAILURE`
1919+
/// exit codes as well as `From<u8> for ExitCode` for constructing other
1920+
/// arbitrary exit codes.
19171921
///
19181922
/// # Portability
19191923
///
@@ -1952,7 +1956,7 @@ impl crate::error::Error for ExitStatusError {}
19521956
/// ExitCode::SUCCESS
19531957
/// }
19541958
/// ```
1955-
#[derive(Clone, Copy, Debug)]
1959+
#[derive(Clone, Copy, Debug, PartialEq)]
19561960
#[stable(feature = "process_exitcode", since = "1.61.0")]
19571961
pub struct ExitCode(imp::ExitCode);
19581962

0 commit comments

Comments
 (0)