Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 171f5db

Browse files
committedJun 29, 2024
Auto merge of rust-lang#127121 - GuillaumeGomez:rollup-xjjjckn, r=GuillaumeGomez
Rollup of 7 pull requests Successful merges: - rust-lang#126805 (Migrate `pdb-alt-path`, `mismatching-target-triples` and `mingw-export-call-convention` `run-make` tests to rmake) - rust-lang#126995 (Migrate `pretty-print-with-dep-file`, `pretty-print-to-file` and `libtest-padding` `run-make` tests to rmake) - rust-lang#127041 (Migrate `run-make/override-aliased-flags` to `rmake.rs`) - rust-lang#127072 (docs: say "includes" instead of "does include") - rust-lang#127073 (Remove unnecessary SeqCst in `impl fmt::Pointer for AtomicPtr`) - rust-lang#127112 (Bootstrap: Don't get output if `lldb --version` errors) - rust-lang#127116 (Migrate `run-make/return-non-c-like-enum` to `rmake.rs`) Failed merges: - rust-lang#127050 (Make mtime of reproducible tarballs dependent on git commit) r? `@ghost` `@rustbot` modify labels: rollup
2 parents e5a577d + 1858bdc commit 171f5db

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed
 

‎core/src/sync/atomic.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3766,7 +3766,7 @@ impl<T> fmt::Debug for AtomicPtr<T> {
37663766
#[stable(feature = "atomic_pointer", since = "1.24.0")]
37673767
impl<T> fmt::Pointer for AtomicPtr<T> {
37683768
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
3769-
fmt::Pointer::fmt(&self.load(Ordering::SeqCst), f)
3769+
fmt::Pointer::fmt(&self.load(Ordering::Relaxed), f)
37703770
}
37713771
}
37723772

‎core/src/time.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -842,7 +842,7 @@ impl Duration {
842842

843843
/// Returns the number of seconds contained by this `Duration` as `f64`.
844844
///
845-
/// The returned value does include the fractional (nanosecond) part of the duration.
845+
/// The returned value includes the fractional (nanosecond) part of the duration.
846846
///
847847
/// # Examples
848848
/// ```
@@ -861,7 +861,7 @@ impl Duration {
861861

862862
/// Returns the number of seconds contained by this `Duration` as `f32`.
863863
///
864-
/// The returned value does include the fractional (nanosecond) part of the duration.
864+
/// The returned value includes the fractional (nanosecond) part of the duration.
865865
///
866866
/// # Examples
867867
/// ```
@@ -880,7 +880,7 @@ impl Duration {
880880

881881
/// Returns the number of milliseconds contained by this `Duration` as `f64`.
882882
///
883-
/// The returned value does include the fractional (nanosecond) part of the duration.
883+
/// The returned value includes the fractional (nanosecond) part of the duration.
884884
///
885885
/// # Examples
886886
/// ```
@@ -901,7 +901,7 @@ impl Duration {
901901

902902
/// Returns the number of milliseconds contained by this `Duration` as `f32`.
903903
///
904-
/// The returned value does include the fractional (nanosecond) part of the duration.
904+
/// The returned value includes the fractional (nanosecond) part of the duration.
905905
///
906906
/// # Examples
907907
/// ```

0 commit comments

Comments
 (0)
Failed to load comments.