Robot/fd
1
0
Fork 0
mirror of https://github.com/sharkdp/fd.git synced 2024-11-18 09:50:34 +01:00
Code Issues Projects Releases Packages Wiki Activity

Workaround for the unsafe block.

Browse source 
See #147
This commit is contained in:
sharkdp 2017-10-25 21:33:44 +02:00 committed by David Peter
parent 7b8d9322ba
commit 9d26b74c2a
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/walk.rs
View file

@ -6,7 +6,7 @@
// notice may not be copied, modified, or distributed except // notice may not be copied, modified, or distributed except
// according to those terms. // according to those terms.
use exec::{self, TokenizedCommand}; use exec;
use fshelper; use fshelper;
use internal::{error, FdOptions}; use internal::{error, FdOptions};
use output; use output;
@ -83,9 +83,11 @@ pub fn scan(root: &Path, pattern: Arc<Regex>, config: Arc<FdOptions>) {
let out_perm = Arc::new(Mutex::new(())); let out_perm = Arc::new(Mutex::new(()));
// This is safe because `cmd` will exist beyond the end of this scope. // TODO: the following line is a workaround to replace the `unsafe` block that was
// It's required to tell Rust that it's safe to share across threads. // previously used here to avoid the (unnecessary?) cloning of the command. The
let cmd = unsafe { Arc::from_raw(cmd as *const TokenizedCommand) }; // `unsafe` block caused problems on some platforms (SIGILL instructions on Linux) and
// therefore had to be removed.
let cmd = Arc::new(cmd.clone());
// Each spawned job will store it's thread handle in here. // Each spawned job will store it's thread handle in here.
let mut handles = Vec::with_capacity(threads); let mut handles = Vec::with_capacity(threads);