Skip to content

Commit fd2c0c7

Browse files
committed
Auto merge of rust-lang#99112 - matthiaskrgr:rollup-uv2zk4d, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - rust-lang#99045 (improve print styles) - rust-lang#99086 (Fix display of search result crate filter dropdown) - rust-lang#99100 (Fix binary name in help message for test binaries) - rust-lang#99103 (Avoid some `&str` to `String` conversions) - rust-lang#99109 (fill new tracking issue for `feature(strict_provenance_atomic_ptr)`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 0e4f9a7 + 19a8d95 commit fd2c0c7

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

Diff for: core/src/sync/atomic.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -1487,7 +1487,7 @@ impl<T> AtomicPtr<T> {
14871487
/// ```
14881488
#[inline]
14891489
#[cfg(target_has_atomic = "ptr")]
1490-
#[unstable(feature = "strict_provenance_atomic_ptr", issue = "95228")]
1490+
#[unstable(feature = "strict_provenance_atomic_ptr", issue = "99108")]
14911491
pub fn fetch_ptr_add(&self, val: usize, order: Ordering) -> *mut T {
14921492
self.fetch_byte_add(val.wrapping_mul(core::mem::size_of::<T>()), order)
14931493
}
@@ -1531,7 +1531,7 @@ impl<T> AtomicPtr<T> {
15311531
/// ```
15321532
#[inline]
15331533
#[cfg(target_has_atomic = "ptr")]
1534-
#[unstable(feature = "strict_provenance_atomic_ptr", issue = "95228")]
1534+
#[unstable(feature = "strict_provenance_atomic_ptr", issue = "99108")]
15351535
pub fn fetch_ptr_sub(&self, val: usize, order: Ordering) -> *mut T {
15361536
self.fetch_byte_sub(val.wrapping_mul(core::mem::size_of::<T>()), order)
15371537
}
@@ -1566,7 +1566,7 @@ impl<T> AtomicPtr<T> {
15661566
/// ```
15671567
#[inline]
15681568
#[cfg(target_has_atomic = "ptr")]
1569-
#[unstable(feature = "strict_provenance_atomic_ptr", issue = "95228")]
1569+
#[unstable(feature = "strict_provenance_atomic_ptr", issue = "99108")]
15701570
pub fn fetch_byte_add(&self, val: usize, order: Ordering) -> *mut T {
15711571
#[cfg(not(bootstrap))]
15721572
// SAFETY: data races are prevented by atomic intrinsics.
@@ -1609,7 +1609,7 @@ impl<T> AtomicPtr<T> {
16091609
/// ```
16101610
#[inline]
16111611
#[cfg(target_has_atomic = "ptr")]
1612-
#[unstable(feature = "strict_provenance_atomic_ptr", issue = "95228")]
1612+
#[unstable(feature = "strict_provenance_atomic_ptr", issue = "99108")]
16131613
pub fn fetch_byte_sub(&self, val: usize, order: Ordering) -> *mut T {
16141614
#[cfg(not(bootstrap))]
16151615
// SAFETY: data races are prevented by atomic intrinsics.
@@ -1667,7 +1667,7 @@ impl<T> AtomicPtr<T> {
16671667
/// ```
16681668
#[inline]
16691669
#[cfg(target_has_atomic = "ptr")]
1670-
#[unstable(feature = "strict_provenance_atomic_ptr", issue = "95228")]
1670+
#[unstable(feature = "strict_provenance_atomic_ptr", issue = "99108")]
16711671
pub fn fetch_or(&self, val: usize, order: Ordering) -> *mut T {
16721672
#[cfg(not(bootstrap))]
16731673
// SAFETY: data races are prevented by atomic intrinsics.
@@ -1724,7 +1724,7 @@ impl<T> AtomicPtr<T> {
17241724
/// ```
17251725
#[inline]
17261726
#[cfg(target_has_atomic = "ptr")]
1727-
#[unstable(feature = "strict_provenance_atomic_ptr", issue = "95228")]
1727+
#[unstable(feature = "strict_provenance_atomic_ptr", issue = "99108")]
17281728
pub fn fetch_and(&self, val: usize, order: Ordering) -> *mut T {
17291729
#[cfg(not(bootstrap))]
17301730
// SAFETY: data races are prevented by atomic intrinsics.
@@ -1779,7 +1779,7 @@ impl<T> AtomicPtr<T> {
17791779
/// ```
17801780
#[inline]
17811781
#[cfg(target_has_atomic = "ptr")]
1782-
#[unstable(feature = "strict_provenance_atomic_ptr", issue = "95228")]
1782+
#[unstable(feature = "strict_provenance_atomic_ptr", issue = "99108")]
17831783
pub fn fetch_xor(&self, val: usize, order: Ordering) -> *mut T {
17841784
#[cfg(not(bootstrap))]
17851785
// SAFETY: data races are prevented by atomic intrinsics.

Diff for: test/src/cli.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ Test Attributes:
196196
pub fn parse_opts(args: &[String]) -> Option<OptRes> {
197197
// Parse matches.
198198
let opts = optgroups();
199+
let binary = args.get(0).map(|c| &**c).unwrap_or("...");
199200
let args = args.get(1..).unwrap_or(args);
200201
let matches = match opts.parse(args) {
201202
Ok(m) => m,
@@ -205,7 +206,7 @@ pub fn parse_opts(args: &[String]) -> Option<OptRes> {
205206
// Check if help was requested.
206207
if matches.opt_present("h") {
207208
// Show help and do nothing more.
208-
usage(&args[0], &opts);
209+
usage(binary, &opts);
209210
return None;
210211
}
211212

0 commit comments

Comments
 (0)