Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit171f5db

Browse files
committed
Auto merge ofrust-lang#127121 - GuillaumeGomez:rollup-xjjjckn, r=GuillaumeGomez
Rollup of 7 pull requestsSuccessful 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 parentse5a577d +1858bdc commit171f5db

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

‎core/src/sync/atomic.rs‎

Lines changed: 1 addition & 1 deletion
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::PointerforAtomicPtr<T>{
37683768
fnfmt(&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‎

Lines changed: 4 additions & 4 deletions
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 valuedoes include the fractional (nanosecond) part of the duration.
845+
/// The returned valueincludes 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 valuedoes include the fractional (nanosecond) part of the duration.
864+
/// The returned valueincludes 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 valuedoes include the fractional (nanosecond) part of the duration.
883+
/// The returned valueincludes 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 valuedoes include the fractional (nanosecond) part of the duration.
904+
/// The returned valueincludes the fractional (nanosecond) part of the duration.
905905
///
906906
/// # Examples
907907
/// ```

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp