Skip to content

Commit 71d8d81

Browse files
committed
Auto merge of rust-lang#145600 - jieyouxu:rollup-jw0bpnt, r=jieyouxu
Rollup of 15 pull requests Successful merges: - rust-lang#145338 (actually provide the correct args to coroutine witnesses) - rust-lang#145429 (Couple of codegen_fn_attrs improvements) - rust-lang#145452 (Do not strip binaries in bootstrap everytime if they are unchanged) - rust-lang#145464 (Stabilize `const_pathbuf_osstring_new` feature) - rust-lang#145474 (Properly recover from parenthesized use-bounds (precise capturing lists) plus small cleanups) - rust-lang#145486 (Fix `unicode_data.rs` mention message) - rust-lang#145490 (Trace some basic I/O operations in bootstrap) - rust-lang#145493 (remove `should_render` in `PrintAttribute` derive) - rust-lang#145500 (Port must_use to the new target checking) - rust-lang#145505 (Simplify span caches) - rust-lang#145510 (Visit and print async_fut local for async drop.) - rust-lang#145511 (Rust build fails on OpenBSD after using file_lock feature) - rust-lang#145532 (resolve: debug for block module) - rust-lang#145533 (Reorder `lto` options from most to least optimizing) - rust-lang#145537 (Do not consider a `T: !Sized` candidate to satisfy a `T: !MetaSized` obligation.) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 2c0774f + 6ebc8a8 commit 71d8d81

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

std/src/ffi/os_str.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ impl OsString {
137137
#[stable(feature = "rust1", since = "1.0.0")]
138138
#[must_use]
139139
#[inline]
140-
#[rustc_const_unstable(feature = "const_pathbuf_osstring_new", issue = "141520")]
140+
#[rustc_const_stable(feature = "const_pathbuf_osstring_new", since = "CURRENT_RUSTC_VERSION")]
141141
pub const fn new() -> OsString {
142142
OsString { inner: Buf::from_string(String::new()) }
143143
}

std/src/path.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1191,7 +1191,7 @@ impl PathBuf {
11911191
#[stable(feature = "rust1", since = "1.0.0")]
11921192
#[must_use]
11931193
#[inline]
1194-
#[rustc_const_unstable(feature = "const_pathbuf_osstring_new", issue = "141520")]
1194+
#[rustc_const_stable(feature = "const_pathbuf_osstring_new", since = "CURRENT_RUSTC_VERSION")]
11951195
pub const fn new() -> PathBuf {
11961196
PathBuf { inner: OsString::new() }
11971197
}

std/src/sys/fs/unix.rs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1264,6 +1264,7 @@ impl File {
12641264
target_os = "fuchsia",
12651265
target_os = "linux",
12661266
target_os = "netbsd",
1267+
target_os = "openbsd",
12671268
target_vendor = "apple",
12681269
))]
12691270
pub fn lock(&self) -> io::Result<()> {
@@ -1276,6 +1277,7 @@ impl File {
12761277
target_os = "fuchsia",
12771278
target_os = "linux",
12781279
target_os = "netbsd",
1280+
target_os = "openbsd",
12791281
target_vendor = "apple",
12801282
)))]
12811283
pub fn lock(&self) -> io::Result<()> {
@@ -1287,6 +1289,7 @@ impl File {
12871289
target_os = "fuchsia",
12881290
target_os = "linux",
12891291
target_os = "netbsd",
1292+
target_os = "openbsd",
12901293
target_vendor = "apple",
12911294
))]
12921295
pub fn lock_shared(&self) -> io::Result<()> {
@@ -1299,6 +1302,7 @@ impl File {
12991302
target_os = "fuchsia",
13001303
target_os = "linux",
13011304
target_os = "netbsd",
1305+
target_os = "openbsd",
13021306
target_vendor = "apple",
13031307
)))]
13041308
pub fn lock_shared(&self) -> io::Result<()> {
@@ -1310,6 +1314,7 @@ impl File {
13101314
target_os = "fuchsia",
13111315
target_os = "linux",
13121316
target_os = "netbsd",
1317+
target_os = "openbsd",
13131318
target_vendor = "apple",
13141319
))]
13151320
pub fn try_lock(&self) -> Result<(), TryLockError> {
@@ -1330,6 +1335,7 @@ impl File {
13301335
target_os = "fuchsia",
13311336
target_os = "linux",
13321337
target_os = "netbsd",
1338+
target_os = "openbsd",
13331339
target_vendor = "apple",
13341340
)))]
13351341
pub fn try_lock(&self) -> Result<(), TryLockError> {
@@ -1344,6 +1350,7 @@ impl File {
13441350
target_os = "fuchsia",
13451351
target_os = "linux",
13461352
target_os = "netbsd",
1353+
target_os = "openbsd",
13471354
target_vendor = "apple",
13481355
))]
13491356
pub fn try_lock_shared(&self) -> Result<(), TryLockError> {
@@ -1364,6 +1371,7 @@ impl File {
13641371
target_os = "fuchsia",
13651372
target_os = "linux",
13661373
target_os = "netbsd",
1374+
target_os = "openbsd",
13671375
target_vendor = "apple",
13681376
)))]
13691377
pub fn try_lock_shared(&self) -> Result<(), TryLockError> {
@@ -1378,6 +1386,7 @@ impl File {
13781386
target_os = "fuchsia",
13791387
target_os = "linux",
13801388
target_os = "netbsd",
1389+
target_os = "openbsd",
13811390
target_vendor = "apple",
13821391
))]
13831392
pub fn unlock(&self) -> io::Result<()> {
@@ -1390,6 +1399,7 @@ impl File {
13901399
target_os = "fuchsia",
13911400
target_os = "linux",
13921401
target_os = "netbsd",
1402+
target_os = "openbsd",
13931403
target_vendor = "apple",
13941404
)))]
13951405
pub fn unlock(&self) -> io::Result<()> {

0 commit comments

Comments
 (0)