From aee3dceac5575e4a2a23633ec5f3da5da79d9e89 Mon Sep 17 00:00:00 2001 From: pin Date: Sun, 17 Sep 2023 22:20:42 +0200 Subject: [PATCH 1/4] one step closer --- src/freedesktop.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/freedesktop.rs b/src/freedesktop.rs index 19b41b7..8277e91 100644 --- a/src/freedesktop.rs +++ b/src/freedesktop.rs @@ -702,12 +702,12 @@ fn get_mount_points() -> Result, Error> { std::str::from_utf8(buf).ok() } } - let mut fs_infos: *mut libc::statfs = std::ptr::null_mut(); + let mut fs_infos: *mut libc::statvfs = std::ptr::null_mut(); let count = unsafe { libc::getmntinfo(&mut fs_infos, libc::MNT_WAIT) }; if count < 1 { return Ok(Vec::new()); } - let fs_infos: &[libc::statfs] = unsafe { std::slice::from_raw_parts(fs_infos as _, count as _) }; + let fs_infos: &[libc::statvfs] = unsafe { std::slice::from_raw_parts(fs_infos as _, count as _) }; let mut result = Vec::new(); for fs_info in fs_infos { From 7d1e2bb0a51d88033428aad62bf87e400c2a334d Mon Sep 17 00:00:00 2001 From: pin Date: Sat, 7 Oct 2023 23:35:59 +0200 Subject: [PATCH 2/4] Update dependencies --- Cargo.toml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index dd103b4..af562f7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,22 +24,22 @@ log = "0.4" [dev-dependencies] serial_test = { version = "2.0.0", default-features = false } -chrono = { version = "0.4.9", default-features = false, features = ["clock"] } -rand = "0.8.3" -once_cell = "1.7.2" +chrono = { version = "0.4.31", default-features = false, features = ["clock"] } +rand = "0.8.5" +once_cell = "1.18.0" env_logger = "0.10.0" -tempfile = "3.6.0" +tempfile = "3.8.0" [target.'cfg(target_os = "macos")'.dependencies] objc = "0.2.7" [target.'cfg(all(unix, not(target_os = "macos"), not(target_os = "ios"), not(target_os = "android")))'.dependencies] -chrono = { version = "0.4.9", optional = true, default-features = false, features = ["clock"] } -libc = "0.2.65" -scopeguard = "1.0.0" -url = "2.1.0" -once_cell = "1.7.2" +chrono = { version = "0.4.31", optional = true, default-features = false, features = ["clock"] } +libc = "0.2.149" +scopeguard = "1.2.0" +url = "2.4.1" +once_cell = "1.18.0" [target.'cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd"))'.dependencies] once_cell = "1.7.2" @@ -50,4 +50,4 @@ windows = { version = "0.44.0", features = [ "Win32_System_Com_StructuredStorage", "Win32_UI_Shell_PropertiesSystem", ] } -scopeguard = "1.0.0" +scopeguard = "1.2.0" From 75cc27093d01628fb79acb1432c8ccdd66d86b2f Mon Sep 17 00:00:00 2001 From: pin Date: Sun, 8 Oct 2023 07:28:16 +0200 Subject: [PATCH 3/4] Bump version --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index af562f7..a85a76a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ [package] name = "trash" -version = "3.0.6" +version = "3.0.7" authors = ["Artur Kovacs "] license = "MIT" readme = "README.md" From b77bd6d32f8d44f59b9fe53806248d0b0860aa18 Mon Sep 17 00:00:00 2001 From: pin Date: Sun, 8 Oct 2023 07:42:34 +0200 Subject: [PATCH 4/4] Test edition bump Test if it makes the CI happy --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index a85a76a..96095fd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,7 @@ readme = "README.md" description = "A library for moving files and folders to the Recycle Bin" keywords = ["remove", "trash", "rubbish", "recycle", "bin"] repository = "https://github.com/ArturKovacs/trash" -edition = "2018" +edition = "2021" include = ["src/**/*", "LICENSE.txt", "README.md", "CHANGELOG.md", "build.rs"] [features]