bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove now redundant check in symlink_hard_link test

Browse source 
We support macOS 10.12 and above, so it now always uses linkat, so the
check is redundant.

This was missed in #126351.
This commit is contained in:
Mads Marquart 2024-09-07 13:24:16 +02:00
parent 9afe713695
commit a6c6eda61d
1 changed files with 0 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

18
library/std/src/fs/tests.rs
View file

@ -1,7 +1,5 @@
use rand::RngCore; use rand::RngCore;
#[cfg(target_os = "macos")]
use crate::ffi::{c_char, c_int};
use crate::fs::{self, File, FileTimes, OpenOptions}; use crate::fs::{self, File, FileTimes, OpenOptions};
use crate::io::prelude::*; use crate::io::prelude::*;
use crate::io::{BorrowedBuf, ErrorKind, SeekFrom}; use crate::io::{BorrowedBuf, ErrorKind, SeekFrom};
@ -16,8 +14,6 @@ use crate::os::unix::fs::symlink as junction_point;
use crate::os::windows::fs::{junction_point, symlink_dir, symlink_file, OpenOptionsExt}; use crate::os::windows::fs::{junction_point, symlink_dir, symlink_file, OpenOptionsExt};
use crate::path::Path; use crate::path::Path;
use crate::sync::Arc; use crate::sync::Arc;
#[cfg(target_os = "macos")]
use crate::sys::weak::weak;
use crate::sys_common::io::test::{tmpdir, TempDir}; use crate::sys_common::io::test::{tmpdir, TempDir};
use crate::time::{Duration, Instant, SystemTime}; use crate::time::{Duration, Instant, SystemTime};
use crate::{env, str, thread}; use crate::{env, str, thread};
@ -80,17 +76,6 @@ pub fn got_symlink_permission(tmpdir: &TempDir) -> bool {
} }
} }
#[cfg(target_os = "macos")]
fn able_to_not_follow_symlinks_while_hard_linking() -> bool {
weak!(fn linkat(c_int, *const c_char, c_int, *const c_char, c_int) -> c_int);
linkat.get().is_some()
}
#[cfg(not(target_os = "macos"))]
fn able_to_not_follow_symlinks_while_hard_linking() -> bool {
return true;
}
#[test] #[test]
fn file_test_io_smoke_test() { fn file_test_io_smoke_test() {
let message = "it's alright. have a good time"; let message = "it's alright. have a good time";
@ -1456,9 +1441,6 @@ fn symlink_hard_link() {
if !got_symlink_permission(&tmpdir) { if !got_symlink_permission(&tmpdir) {
return; return;
}; };
if !able_to_not_follow_symlinks_while_hard_linking() {
return;
}
// Create "file", a file. // Create "file", a file.
check!(fs::File::create(tmpdir.join("file"))); check!(fs::File::create(tmpdir.join("file")));