Skip to content

Rollup of 9 pull requests #148337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bors merged 23 commits into from
Nov 1, 2025
Merged

Rollup of 9 pull requests #148337

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
60a7cab
Use fstatat() in DirEntry::metadata on Apple platforms
jesseschalken Oct 22, 2025
fe4c2a2
typo
jesseschalken Oct 22, 2025
63bb238
implement VecDeque extend_from_within and prepend_from_within, add tests
antonilol Oct 23, 2025
73b734b
Pass `debuginfo_compression` through FFI as an enum
Zalathar Oct 23, 2025
d5839f9
Enable regression labeling aliases
apiraino Oct 21, 2025
c5b30c3
docs: Fix argument names for `carrying_mul_add`
sorairolake Oct 31, 2025
761ae9a
add tier 3 HelenOS compiler targets
mvolfik Jun 5, 2025
3d9c69b
enable flock for illumos
emilyalbini Oct 31, 2025
06a2e72
Implement VecDeque::extract_if
tisonkun Oct 16, 2025
bf7b05c
refactor: move runtime functions to core
Kmeakin Oct 11, 2025
c8ab427
refactor: format `unicode_data`
Kmeakin Oct 11, 2025
6d75cd2
refactor: remove check that `first_code_point` is non-ascii
Kmeakin Oct 11, 2025
9a80731
refactor: make string formatting more readable
Kmeakin Oct 11, 2025
0e6131c
refactor: make `unicode_data` tests normal tests
Kmeakin Oct 19, 2025
652e5cb
Rollup merge of #139310 - mvolfik:helenos-compiler, r=wesleywiser
matthiaskrgr Oct 31, 2025
53c52a2
Rollup merge of #147161 - antonilol:vec-deque-extend-from-within, r=j…
matthiaskrgr Oct 31, 2025
75fbbd3
Rollup merge of #147622 - Kmeakin:km/unicode-data/refactors, r=joboet
matthiaskrgr Oct 31, 2025
c42f8eb
Rollup merge of #147780 - tisonkun:vec-deque-extract-if, r=joboet
matthiaskrgr Oct 31, 2025
a289ae4
Rollup merge of #147942 - apiraino:enable-label-aliases, r=Urgau
matthiaskrgr Oct 31, 2025
c438dbd
Rollup merge of #147986 - jesseschalken:use-fstatat-macos, r=joboet
matthiaskrgr Oct 31, 2025
3d671c0
Rollup merge of #148103 - Zalathar:compression, r=wesleywiser
matthiaskrgr Oct 31, 2025
3605e14
Rollup merge of #148319 - sorairolake:fix-carrying_mul_add-docs, r=Am…
matthiaskrgr Oct 31, 2025
eaa283d
Rollup merge of #148322 - oxidecomputer:ea-flock-illumos, r=ChrisDenton
matthiaskrgr Oct 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
enable flock for illumos
  • Loading branch information
@emilyalbini
emilyalbini committed Oct 31, 2025
commit 3d9c69b594ef411e9dc623bc56aab30d0c8d5111
6 changes: 6 additions & 0 deletions library/std/src/fs/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ use rand::RngCore;
target_os = "freebsd",
target_os = "linux",
target_os = "netbsd",
target_os = "illumos",
target_vendor = "apple",
))]
use crate::assert_matches::assert_matches;
Expand All @@ -14,6 +15,7 @@ use crate::char::MAX_LEN_UTF8;
target_os = "freebsd",
target_os = "linux",
target_os = "netbsd",
target_os = "illumos",
target_vendor = "apple",
))]
use crate::fs::TryLockError;
Expand Down Expand Up @@ -227,6 +229,7 @@ fn file_test_io_seek_and_write() {
target_os = "linux",
target_os = "netbsd",
target_os = "solaris",
target_os = "illumos",
target_vendor = "apple",
))]
fn file_lock_multiple_shared() {
Expand All @@ -251,6 +254,7 @@ fn file_lock_multiple_shared() {
target_os = "linux",
target_os = "netbsd",
target_os = "solaris",
target_os = "illumos",
target_vendor = "apple",
))]
fn file_lock_blocking() {
Expand All @@ -276,6 +280,7 @@ fn file_lock_blocking() {
target_os = "linux",
target_os = "netbsd",
target_os = "solaris",
target_os = "illumos",
target_vendor = "apple",
))]
fn file_lock_drop() {
Expand All @@ -298,6 +303,7 @@ fn file_lock_drop() {
target_os = "linux",
target_os = "netbsd",
target_os = "solaris",
target_os = "illumos",
target_vendor = "apple",
))]
fn file_lock_dup() {
Expand Down
10 changes: 10 additions & 0 deletions library/std/src/sys/fs/unix.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1292,6 +1292,7 @@ impl File {
target_os = "netbsd",
target_os = "openbsd",
target_os = "cygwin",
target_os = "illumos",
target_vendor = "apple",
))]
pub fn lock(&self) -> io::Result<()> {
Expand All @@ -1316,6 +1317,7 @@ impl File {
target_os = "openbsd",
target_os = "cygwin",
target_os = "solaris",
target_os = "illumos",
target_vendor = "apple",
)))]
pub fn lock(&self) -> io::Result<()> {
Expand All @@ -1329,6 +1331,7 @@ impl File {
target_os = "netbsd",
target_os = "openbsd",
target_os = "cygwin",
target_os = "illumos",
target_vendor = "apple",
))]
pub fn lock_shared(&self) -> io::Result<()> {
Expand All @@ -1353,6 +1356,7 @@ impl File {
target_os = "openbsd",
target_os = "cygwin",
target_os = "solaris",
target_os = "illumos",
target_vendor = "apple",
)))]
pub fn lock_shared(&self) -> io::Result<()> {
Expand All @@ -1366,6 +1370,7 @@ impl File {
target_os = "netbsd",
target_os = "openbsd",
target_os = "cygwin",
target_os = "illumos",
target_vendor = "apple",
))]
pub fn try_lock(&self) -> Result<(), TryLockError> {
Expand Down Expand Up @@ -1406,6 +1411,7 @@ impl File {
target_os = "openbsd",
target_os = "cygwin",
target_os = "solaris",
target_os = "illumos",
target_vendor = "apple",
)))]
pub fn try_lock(&self) -> Result<(), TryLockError> {
Expand All @@ -1422,6 +1428,7 @@ impl File {
target_os = "netbsd",
target_os = "openbsd",
target_os = "cygwin",
target_os = "illumos",
target_vendor = "apple",
))]
pub fn try_lock_shared(&self) -> Result<(), TryLockError> {
Expand Down Expand Up @@ -1462,6 +1469,7 @@ impl File {
target_os = "openbsd",
target_os = "cygwin",
target_os = "solaris",
target_os = "illumos",
target_vendor = "apple",
)))]
pub fn try_lock_shared(&self) -> Result<(), TryLockError> {
Expand All @@ -1478,6 +1486,7 @@ impl File {
target_os = "netbsd",
target_os = "openbsd",
target_os = "cygwin",
target_os = "illumos",
target_vendor = "apple",
))]
pub fn unlock(&self) -> io::Result<()> {
Expand All @@ -1502,6 +1511,7 @@ impl File {
target_os = "openbsd",
target_os = "cygwin",
target_os = "solaris",
target_os = "illumos",
target_vendor = "apple",
)))]
pub fn unlock(&self) -> io::Result<()> {
Expand Down
Loading