proxmox-mirrors/proxmox
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox synced 2025-05-09 21:03:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[clippy] tools: lifetimes and constants

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2019-08-22 09:42:05 +02:00
parent a11f6e88f8
commit 09d84f6634
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
proxmox-tools/src/fs.rs
View File

@ -100,9 +100,9 @@ pub fn file_set_contents_full<P: AsRef<Path>>(
let tmp_path = tmp_path.as_path(); let tmp_path = tmp_path.as_path();
let mode: stat::Mode = perm.unwrap_or(stat::Mode::from( // clippy bug?: from_bits_truncate is actually a const fn...
stat::Mode::S_IRUSR | stat::Mode::S_IWUSR | stat::Mode::S_IRGRP | stat::Mode::S_IROTH, #[allow(clippy::or_fun_call)]
)); let mode: stat::Mode = perm.unwrap_or(stat::Mode::from_bits_truncate(0o644));
if perm != None { if perm != None {
if let Err(err) = stat::fchmod(fd, mode) { if let Err(err) = stat::fchmod(fd, mode) {
@ -138,12 +138,8 @@ pub fn fchown(fd: RawFd, owner: Option<Uid>, group: Option<Gid>) -> Result<(), E
// According to the POSIX specification, -1 is used to indicate that owner and group // According to the POSIX specification, -1 is used to indicate that owner and group
// are not to be changed. Since uid_t and gid_t are unsigned types, we have to wrap // are not to be changed. Since uid_t and gid_t are unsigned types, we have to wrap
// around to get -1 (copied fron nix crate). // around to get -1 (copied fron nix crate).
let uid = owner let uid = owner.map(Into::into).unwrap_or(!(0 as libc::uid_t));
.map(Into::into) let gid = group.map(Into::into).unwrap_or(!(0 as libc::gid_t));
.unwrap_or((0 as libc::uid_t).wrapping_sub(1));
let gid = group
.map(Into::into)
.unwrap_or((0 as libc::gid_t).wrapping_sub(1));
let res = unsafe { libc::fchown(fd, uid, gid) }; let res = unsafe { libc::fchown(fd, uid, gid) };
Errno::result(res)?; Errno::result(res)?;
@ -193,6 +189,8 @@ pub fn create_dir_chown<P: AsRef<Path>>(
owner: Option<Uid>, owner: Option<Uid>,
group: Option<Gid>, group: Option<Gid>,
) -> Result<(), nix::Error> { ) -> Result<(), nix::Error> {
// clippy bug?: from_bits_truncate is actually a const fn...
#[allow(clippy::or_fun_call)]
let mode: stat::Mode = perm.unwrap_or(stat::Mode::from_bits_truncate(0o770)); let mode: stat::Mode = perm.unwrap_or(stat::Mode::from_bits_truncate(0o770));
let path = path.as_ref(); let path = path.as_ref();
@ -305,9 +303,11 @@ fn create_path_at_do(
final_opts.as_ref() final_opts.as_ref()
}; };
// clippy bug?: from_bits_truncate is actually a const fn...
#[allow(clippy::or_fun_call)]
let mode = opts let mode = opts
.and_then(|o| o.perm) .and_then(|o| o.perm)
.unwrap_or(stat::Mode::from_bits(0o755).unwrap()); .unwrap_or(stat::Mode::from_bits_truncate(0o755));
let created = match stat::mkdirat(at.as_raw_fd(), path, mode) { let created = match stat::mkdirat(at.as_raw_fd(), path, mode) {
Err(nix::Error::Sys(Errno::EEXIST)) => false, Err(nix::Error::Sys(Errno::EEXIST)) => false,

2
proxmox-tools/src/lib.rs
View File

@ -40,7 +40,7 @@ macro_rules! try_block {
{ $($token:tt)* } => {{ (|| -> Result<_,_> { $($token)* })() }} { $($token:tt)* } => {{ (|| -> Result<_,_> { $($token)* })() }}
} }
const HEX_CHARS: &'static [u8; 16] = b"0123456789abcdef"; const HEX_CHARS: &[u8; 16] = b"0123456789abcdef";
pub fn digest_to_hex(digest: &[u8]) -> String { pub fn digest_to_hex(digest: &[u8]) -> String {
bin_to_hex(digest) bin_to_hex(digest)