Compile on stable

This commit is contained in:
Nbiba Bedis 2021-12-08 11:58:02 +01:00
parent 34c09d5d69
commit 734ffd4331
5 changed files with 14 additions and 7 deletions

View File

@ -93,7 +93,7 @@ where
let mut file = match fs::File::open(path) { let mut file = match fs::File::open(path) {
Ok(f) => f, Ok(f) => f,
Err(e) => { Err(e) => {
if e.kind() == std::io::ErrorKind::NotFound && path.is_symlink() { if e.kind() == std::io::ErrorKind::NotFound && utils::is_symlink(path) {
// This path is for a broken symlink // This path is for a broken symlink
// We just ignore it // We just ignore it
continue; continue;

View File

@ -15,8 +15,8 @@ use crate::{
info, info,
list::FileInArchive, list::FileInArchive,
utils::{ utils::{
cd_into_same_dir_as, concatenate_os_str_list, dir_is_empty, get_invalid_utf8_paths, strip_cur_dir, to_utf, self, cd_into_same_dir_as, concatenate_os_str_list, dir_is_empty, get_invalid_utf8_paths, strip_cur_dir,
Bytes, to_utf, Bytes,
}, },
}; };
@ -145,7 +145,7 @@ where
let file_bytes = match fs::read(entry.path()) { let file_bytes = match fs::read(entry.path()) {
Ok(b) => b, Ok(b) => b,
Err(e) => { Err(e) => {
if e.kind() == std::io::ErrorKind::NotFound && path.is_symlink() { if e.kind() == std::io::ErrorKind::NotFound && utils::is_symlink(path) {
// This path is for a broken symlink // This path is for a broken symlink
// We just ignore it // We just ignore it
continue; continue;

View File

@ -5,8 +5,6 @@
// used as a binary. Since `clap` doesn't remove URL markup in it's help output, // used as a binary. Since `clap` doesn't remove URL markup in it's help output,
// we don't mark them as URLs. This suppresses the relevant rustdoc warning: // we don't mark them as URLs. This suppresses the relevant rustdoc warning:
#![allow(rustdoc::bare_urls)] #![allow(rustdoc::bare_urls)]
// Useful to detect broken symlinks when compressing. (So we can safely ignore them)
#![feature(is_symlink)]
// Macros should be declared before // Macros should be declared before
pub mod macros; pub mod macros;

View File

@ -119,3 +119,10 @@ pub fn try_infer_extension(path: &Path) -> Option<Extension> {
None None
} }
} }
/// Returns true if a path is a symlink.
/// This is the same as the nightly https://doc.rust-lang.org/std/path/struct.Path.html#method.is_symlink
// Useful to detect broken symlinks when compressing. (So we can safely ignore them)
pub fn is_symlink(path: &Path) -> bool {
fs::symlink_metadata(path).map(|m| m.file_type().is_symlink()).unwrap_or(false)
}

View File

@ -9,7 +9,9 @@ mod fs;
mod question; mod question;
pub use formatting::{concatenate_os_str_list, nice_directory_display, strip_cur_dir, to_utf, Bytes}; pub use formatting::{concatenate_os_str_list, nice_directory_display, strip_cur_dir, to_utf, Bytes};
pub use fs::{cd_into_same_dir_as, clear_path, create_dir_if_non_existent, dir_is_empty, try_infer_extension}; pub use fs::{
cd_into_same_dir_as, clear_path, create_dir_if_non_existent, dir_is_empty, is_symlink, try_infer_extension,
};
pub use question::{ pub use question::{
create_or_ask_overwrite, user_wants_to_continue_decompressing, user_wants_to_overwrite, QuestionPolicy, create_or_ask_overwrite, user_wants_to_continue_decompressing, user_wants_to_overwrite, QuestionPolicy,
}; };