Skip to content

Commit

Permalink
remove cfg_atter tarpaulin (#13739)
Browse files Browse the repository at this point in the history
# Description

Remove the `#[cfg_attr(tarpaulin, ignore)]` code coverage attributes to
get rid warnings when compiling plugins with a more recent rust version
than nushell.
  • Loading branch information
fdncred authored Aug 31, 2024
1 parent 0119534 commit 3f31ca7
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 21 deletions.
5 changes: 0 additions & 5 deletions crates/nu-system/src/macos.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ pub struct ProcessInfo {
pub interval: Duration,
}

#[cfg_attr(tarpaulin, ignore)]
pub fn collect_proc(interval: Duration, _with_thread: bool) -> Vec<ProcessInfo> {
let mut base_procs = Vec::new();
let mut ret = Vec::new();
Expand Down Expand Up @@ -116,7 +115,6 @@ pub fn collect_proc(interval: Duration, _with_thread: bool) -> Vec<ProcessInfo>
ret
}

#[cfg_attr(tarpaulin, ignore)]
fn get_arg_max() -> size_t {
let mut mib: [c_int; 2] = [libc::CTL_KERN, libc::KERN_ARGMAX];
let mut arg_max = 0i32;
Expand Down Expand Up @@ -144,14 +142,12 @@ pub struct PathInfo {
pub cwd: PathBuf,
}

#[cfg_attr(tarpaulin, ignore)]
unsafe fn get_unchecked_str(cp: *mut u8, start: *mut u8) -> String {
let len = (cp as usize).saturating_sub(start as usize);
let part = std::slice::from_raw_parts(start, len);
String::from_utf8_unchecked(part.to_vec())
}

#[cfg_attr(tarpaulin, ignore)]
fn get_path_info(pid: i32, mut size: size_t) -> Option<PathInfo> {
let mut proc_args = Vec::with_capacity(size);
let ptr: *mut u8 = proc_args.as_mut_slice().as_mut_ptr();
Expand Down Expand Up @@ -252,7 +248,6 @@ fn get_path_info(pid: i32, mut size: size_t) -> Option<PathInfo> {
}
}

#[cfg_attr(tarpaulin, ignore)]
fn clone_task_all_info(src: &TaskAllInfo) -> TaskAllInfo {
let pbsd = BSDInfo {
pbi_flags: src.pbsd.pbi_flags,
Expand Down
16 changes: 0 additions & 16 deletions crates/nu-system/src/windows.rs
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ pub struct CpuInfo {
pub curr_user: u64,
}

#[cfg_attr(tarpaulin, ignore)]
pub fn collect_proc(interval: Duration, _with_thread: bool) -> Vec<ProcessInfo> {
let mut base_procs = Vec::new();
let mut ret = Vec::new();
Expand Down Expand Up @@ -257,7 +256,6 @@ pub fn collect_proc(interval: Duration, _with_thread: bool) -> Vec<ProcessInfo>
ret
}

#[cfg_attr(tarpaulin, ignore)]
fn set_privilege() -> bool {
unsafe {
let handle = GetCurrentProcess();
Expand All @@ -284,7 +282,6 @@ fn set_privilege() -> bool {
}
}

#[cfg_attr(tarpaulin, ignore)]
fn get_pids() -> Vec<i32> {
let dword_size = size_of::<u32>();
let mut pids: Vec<u32> = Vec::with_capacity(10192);
Expand All @@ -307,7 +304,6 @@ fn get_pids() -> Vec<i32> {
pids.iter().map(|x| *x as i32).collect()
}

#[cfg_attr(tarpaulin, ignore)]
fn get_ppid_threads() -> (HashMap<i32, i32>, HashMap<i32, i32>) {
let mut ppids = HashMap::new();
let mut threads = HashMap::new();
Expand All @@ -332,7 +328,6 @@ fn get_ppid_threads() -> (HashMap<i32, i32>, HashMap<i32, i32>) {
(ppids, threads)
}

#[cfg_attr(tarpaulin, ignore)]
fn get_handle(pid: i32) -> Option<HANDLE> {
if pid == 0 {
return None;
Expand All @@ -353,7 +348,6 @@ fn get_handle(pid: i32) -> Option<HANDLE> {
}
}

#[cfg_attr(tarpaulin, ignore)]
fn get_times(handle: HANDLE) -> Option<(u64, u64, u64, u64)> {
unsafe {
let mut start: FILETIME = zeroed();
Expand Down Expand Up @@ -382,7 +376,6 @@ fn get_times(handle: HANDLE) -> Option<(u64, u64, u64, u64)> {
}
}

#[cfg_attr(tarpaulin, ignore)]
fn get_memory_info(handle: HANDLE) -> Option<MemoryInfo> {
unsafe {
let mut pmc: PROCESS_MEMORY_COUNTERS_EX = zeroed();
Expand Down Expand Up @@ -413,7 +406,6 @@ fn get_memory_info(handle: HANDLE) -> Option<MemoryInfo> {
}
}

#[cfg_attr(tarpaulin, ignore)]
fn get_command(handle: HANDLE) -> Option<String> {
unsafe {
let mut exe_buf = [0u16; MAX_PATH as usize + 1];
Expand Down Expand Up @@ -780,7 +772,6 @@ fn get_cwd<T: RtlUserProcessParameters>(params: &T, handle: HANDLE) -> PathBuf {
}
}

#[cfg_attr(tarpaulin, ignore)]
fn get_io(handle: HANDLE) -> Option<(u64, u64)> {
unsafe {
let mut io: IO_COUNTERS = zeroed();
Expand All @@ -801,7 +792,6 @@ pub struct SidName {
pub domainname: Option<String>,
}

#[cfg_attr(tarpaulin, ignore)]
fn get_user(handle: HANDLE) -> Option<SidName> {
unsafe {
let mut token: HANDLE = zeroed();
Expand Down Expand Up @@ -854,7 +844,6 @@ fn get_user(handle: HANDLE) -> Option<SidName> {
}
}

#[cfg_attr(tarpaulin, ignore)]
fn get_groups(handle: HANDLE) -> Option<Vec<SidName>> {
unsafe {
let mut token: HANDLE = zeroed();
Expand Down Expand Up @@ -914,7 +903,6 @@ fn get_groups(handle: HANDLE) -> Option<Vec<SidName>> {
}
}

#[cfg_attr(tarpaulin, ignore)]
fn get_sid(psid: PSID) -> Vec<u64> {
unsafe {
let mut ret = Vec::new();
Expand Down Expand Up @@ -945,7 +933,6 @@ thread_local!(
RefCell::new(HashMap::new());
);

#[cfg_attr(tarpaulin, ignore)]
fn get_name_cached(psid: PSID) -> Option<(String, String)> {
NAME_CACHE.with(|c| {
let mut c = c.borrow_mut();
Expand All @@ -959,7 +946,6 @@ fn get_name_cached(psid: PSID) -> Option<(String, String)> {
})
}

#[cfg_attr(tarpaulin, ignore)]
fn get_name(psid: PSID) -> Option<(String, String)> {
unsafe {
let mut cc_name = 0;
Expand Down Expand Up @@ -1003,7 +989,6 @@ fn get_name(psid: PSID) -> Option<(String, String)> {
}
}

#[cfg_attr(tarpaulin, ignore)]
fn from_wide_ptr(ptr: *const u16) -> String {
unsafe {
assert!(!ptr.is_null());
Expand All @@ -1015,7 +1000,6 @@ fn from_wide_ptr(ptr: *const u16) -> String {
}
}

#[cfg_attr(tarpaulin, ignore)]
fn get_priority(handle: HANDLE) -> u32 {
unsafe { GetPriorityClass(handle) }
}
Expand Down

0 comments on commit 3f31ca7

Please sign in to comment.