Auto merge of #127121 - GuillaumeGomez:rollup-xjjjckn, r=GuillaumeGomez · model-checking/verify-rust-std@171f5db (original) (raw)
Navigation Menu
- Explore
- Pricing
Provide feedback
Saved searches
Use saved searches to filter your results more quickly
Commit 171f5db
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
File tree
2 files changed
lines changed
2 files changed
lines changed
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -3766,7 +3766,7 @@ impl fmt::Debug for AtomicPtr { | ||
| 3766 | 3766 | #[stable(feature = "atomic_pointer", since = "1.24.0")] |
| 3767 | 3767 | impl<T> fmt::Pointer for AtomicPtr<T> { |
| 3768 | 3768 | 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) | |
| 3770 | 3770 | } |
| 3771 | 3771 | } |
| 3772 | 3772 |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -842,7 +842,7 @@ impl Duration { | ||
| 842 | 842 | |
| 843 | 843 | /// Returns the number of seconds contained by this `Duration` as `f64`. |
| 844 | 844 | /// |
| 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. | |
| 846 | 846 | /// |
| 847 | 847 | /// # Examples |
| 848 | 848 | /// ``` |
| @@ -861,7 +861,7 @@ impl Duration { | ||
| 861 | 861 | |
| 862 | 862 | /// Returns the number of seconds contained by this `Duration` as `f32`. |
| 863 | 863 | /// |
| 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. | |
| 865 | 865 | /// |
| 866 | 866 | /// # Examples |
| 867 | 867 | /// ``` |
| @@ -880,7 +880,7 @@ impl Duration { | ||
| 880 | 880 | |
| 881 | 881 | /// Returns the number of milliseconds contained by this `Duration` as `f64`. |
| 882 | 882 | /// |
| 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. | |
| 884 | 884 | /// |
| 885 | 885 | /// # Examples |
| 886 | 886 | /// ``` |
| @@ -901,7 +901,7 @@ impl Duration { | ||
| 901 | 901 | |
| 902 | 902 | /// Returns the number of milliseconds contained by this `Duration` as `f32`. |
| 903 | 903 | /// |
| 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. | |
| 905 | 905 | /// |
| 906 | 906 | /// # Examples |
| 907 | 907 | /// ``` |