From 347e0d4c571f4764d3586f341ae55d906213536d Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Mon, 4 Oct 2021 14:58:55 +0200 Subject: [PATCH] fix deprecated use of std::u64/... modules integer primitive type modules are deprecated, use associated constants instead Signed-off-by: Wolfgang Bumiller --- pbs-api-types/src/acl.rs | 2 +- pbs-client/src/pxar/fuse.rs | 8 ++++---- pbs-fuse-loop/src/fuse_loop.rs | 2 +- pxar-bin/src/main.rs | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pbs-api-types/src/acl.rs b/pbs-api-types/src/acl.rs index 140ff58ea..ad8c66a74 100644 --- a/pbs-api-types/src/acl.rs +++ b/pbs-api-types/src/acl.rs @@ -76,7 +76,7 @@ constnamedbitmap! { /// Admin always has all privileges. It can do everything except a few actions /// which are limited to the 'root@pam` superuser -pub const ROLE_ADMIN: u64 = std::u64::MAX; +pub const ROLE_ADMIN: u64 = u64::MAX; /// NoAccess can be used to remove privileges from specific (sub-)paths pub const ROLE_NO_ACCESS: u64 = 0; diff --git a/pbs-client/src/pxar/fuse.rs b/pbs-client/src/pxar/fuse.rs index 1f5b1dd8e..91970c8ed 100644 --- a/pbs-client/src/pxar/fuse.rs +++ b/pbs-client/src/pxar/fuse.rs @@ -344,7 +344,7 @@ impl SessionImpl { Err(err) => return self.handle_err(request, err, err_sender).await, }, Request::Getattr(request) => match self.getattr(request.inode).await { - Ok(stat) => request.reply(&stat, std::f64::MAX).map_err(Error::from), + Ok(stat) => request.reply(&stat, f64::MAX).map_err(Error::from), Err(err) => return self.handle_err(request, err, err_sender).await, }, Request::ReaddirPlus(mut request) => match self.readdirplus(&mut request).await { @@ -539,7 +539,7 @@ impl SessionImpl { let file = file?.decode_entry().await?; let stat = to_stat(to_inode(&file), &file)?; let name = file.file_name(); - match request.add_entry(name, &stat, next, 1, std::f64::MAX, std::f64::MAX)? { + match request.add_entry(name, &stat, next, 1, f64::MAX, f64::MAX)? { ReplyBufState::Ok => (), ReplyBufState::Full => return Ok(lookups), } @@ -551,7 +551,7 @@ impl SessionImpl { let file = dir.lookup_self().await?; let stat = to_stat(to_inode(&file), &file)?; let name = OsStr::new("."); - match request.add_entry(name, &stat, next, 1, std::f64::MAX, std::f64::MAX)? { + match request.add_entry(name, &stat, next, 1, f64::MAX, f64::MAX)? { ReplyBufState::Ok => (), ReplyBufState::Full => return Ok(lookups), } @@ -565,7 +565,7 @@ impl SessionImpl { let file = parent_dir.lookup_self().await?; let stat = to_stat(to_inode(&file), &file)?; let name = OsStr::new(".."); - match request.add_entry(name, &stat, next, 1, std::f64::MAX, std::f64::MAX)? { + match request.add_entry(name, &stat, next, 1, f64::MAX, f64::MAX)? { ReplyBufState::Ok => (), ReplyBufState::Full => return Ok(lookups), } diff --git a/pbs-fuse-loop/src/fuse_loop.rs b/pbs-fuse-loop/src/fuse_loop.rs index 3836d11c4..66937f07a 100644 --- a/pbs-fuse-loop/src/fuse_loop.rs +++ b/pbs-fuse-loop/src/fuse_loop.rs @@ -176,7 +176,7 @@ impl FuseLoopSession { req.reply(&entry) }, Some(Request::Getattr(req)) => { - req.reply(&self.stat, std::f64::MAX) + req.reply(&self.stat, f64::MAX) }, Some(Request::Read(req)) => { match self.reader.seek(SeekFrom::Start(req.offset)).await { diff --git a/pxar-bin/src/main.rs b/pxar-bin/src/main.rs index ede97d8f4..abc949e25 100644 --- a/pxar-bin/src/main.rs +++ b/pxar-bin/src/main.rs @@ -285,7 +285,7 @@ fn extract_archive( optional: true, default: ENCODER_MAX_ENTRIES as isize, minimum: 0, - maximum: std::isize::MAX, + maximum: isize::MAX, }, }, },