Skip to content

Commit cbe5b3b

Browse files
committed
Updates for clippy.
1 parent b7423e4 commit cbe5b3b

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

cas_client/src/remote_client.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -671,11 +671,12 @@ impl Client for RemoteClient {
671671
}
672672

673673
#[cfg(target_family = "wasm")]
674-
async fn upload_xorb(
674+
async fn upload_xorb_with_permit(
675675
&self,
676676
prefix: &str,
677677
serialized_cas_object: SerializedCasObject,
678678
upload_tracker: Option<Arc<CompletionTracker>>,
679+
_upload_permit: ConnectionPermit,
679680
) -> Result<u64> {
680681
let key = Key {
681682
prefix: prefix.to_string(),

utils/src/adjustable_semaphore.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ impl AdjustableSemaphore {
3939
debug_assert!(initial_permits <= permit_range.1);
4040

4141
Arc::new(Self {
42-
semaphore: Arc::new(Semaphore::new(initial_permits as usize)),
42+
semaphore: Arc::new(Semaphore::new(initial_permits)),
4343
total_permits: initial_permits.into(),
4444
enqueued_permit_decreases: 0.into(),
4545
min_permits: permit_range.0,
@@ -52,7 +52,7 @@ impl AdjustableSemaphore {
5252
}
5353

5454
pub fn available_permits(&self) -> usize {
55-
self.semaphore.available_permits() as usize
55+
self.semaphore.available_permits()
5656
}
5757

5858
pub async fn acquire(self: &Arc<Self>) -> Result<AdjustableSemaphorePermit, AcquireError> {
@@ -85,7 +85,7 @@ impl AdjustableSemaphore {
8585
self.enqueued_permit_decreases.fetch_add(1, Ordering::Relaxed);
8686
}
8787

88-
return true;
88+
true
8989
}
9090

9191
/// Increment the total number of available permits up to the maximum bound.
@@ -116,7 +116,7 @@ impl AdjustableSemaphore {
116116
fn attempt_decrement(v: &AtomicUsize, min_value: usize) -> bool {
117117
v.fetch_update(SeqCst, SeqCst, |x| {
118118
debug_assert!(x >= min_value);
119-
if x >= min_value + 1 {
119+
if x > min_value {
120120
Some(x - 1)
121121
} else {
122122
None
@@ -131,7 +131,7 @@ fn attempt_increment(v: &AtomicUsize, max_value: usize) -> bool {
131131
v.fetch_update(SeqCst, SeqCst, |x| {
132132
debug_assert!(x <= max_value);
133133

134-
if x + 1 <= max_value {
134+
if x < max_value {
135135
Some(x + 1)
136136
} else {
137137
None

0 commit comments

Comments
 (0)