From 90c2dbb0ccc532d1ba014525d9df02caee26b3bb Mon Sep 17 00:00:00 2001 From: David Matos Date: Thu, 19 Oct 2023 09:50:21 +0200 Subject: [PATCH 1/2] mv: make UpdateMode public --- src/uu/mv/src/mv.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/uu/mv/src/mv.rs b/src/uu/mv/src/mv.rs index 9888389aef..02c856ce07 100644 --- a/src/uu/mv/src/mv.rs +++ b/src/uu/mv/src/mv.rs @@ -19,12 +19,12 @@ use std::os::unix; #[cfg(windows)] use std::os::windows; use std::path::{Path, PathBuf}; -pub use uucore::backup_control::BackupMode; use uucore::backup_control::{self, source_is_target_backup}; use uucore::display::Quotable; use uucore::error::{set_exit_code, FromIo, UError, UResult, USimpleError, UUsageError}; use uucore::fs::{are_hardlinks_or_one_way_symlink_to_same_file, are_hardlinks_to_same_file}; -use uucore::update_control::{self, UpdateMode}; +use uucore::update_control; +pub use uucore::{backup_control::BackupMode, update_control::UpdateMode}; use uucore::{format_usage, help_about, help_section, help_usage, prompt_yes, show}; use fs_extra::dir::{ From 383dcde51a7ad501dddbf22dc36f2296532fed90 Mon Sep 17 00:00:00 2001 From: Daniel Hofstetter Date: Thu, 19 Oct 2023 10:08:45 +0200 Subject: [PATCH 2/2] mv: comment why some imports are public --- src/uu/mv/src/mv.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/uu/mv/src/mv.rs b/src/uu/mv/src/mv.rs index 02c856ce07..7236907da7 100644 --- a/src/uu/mv/src/mv.rs +++ b/src/uu/mv/src/mv.rs @@ -24,6 +24,8 @@ use uucore::display::Quotable; use uucore::error::{set_exit_code, FromIo, UError, UResult, USimpleError, UUsageError}; use uucore::fs::{are_hardlinks_or_one_way_symlink_to_same_file, are_hardlinks_to_same_file}; use uucore::update_control; +// These are exposed for projects (e.g. nushell) that want to create an `Options` value, which +// requires these enums pub use uucore::{backup_control::BackupMode, update_control::UpdateMode}; use uucore::{format_usage, help_about, help_section, help_usage, prompt_yes, show};