Skip to content

Commit

Permalink
Auto merge of rust-lang#127121 - GuillaumeGomez:rollup-xjjjckn, r=Gui…
Browse files Browse the repository at this point in the history
…llaumeGomez

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
  • Loading branch information
bors committed Jun 29, 2024
2 parents e5a577d + 1858bdc commit 171f5db
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion core/src/sync/atomic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3766,7 +3766,7 @@ impl<T> fmt::Debug for AtomicPtr<T> {
#[stable(feature = "atomic_pointer", since = "1.24.0")]
impl<T> fmt::Pointer for AtomicPtr<T> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
fmt::Pointer::fmt(&self.load(Ordering::SeqCst), f)
fmt::Pointer::fmt(&self.load(Ordering::Relaxed), f)
}
}

Expand Down
8 changes: 4 additions & 4 deletions core/src/time.rs
Original file line number Diff line number Diff line change
Expand Up @@ -842,7 +842,7 @@ impl Duration {

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

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

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

/// Returns the number of milliseconds contained by this `Duration` as `f32`.
///
/// The returned value does include the fractional (nanosecond) part of the duration.
/// The returned value includes the fractional (nanosecond) part of the duration.
///
/// # Examples
/// ```
Expand Down

0 comments on commit 171f5db

Please sign in to comment.