Skip to content

Commit 9bc076d

Browse files
committed
Update Cargo.lock after dependency changes
1 parent 4817b21 commit 9bc076d

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

rust-runtime/Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust-runtime/aws-smithy-runtime/src/client/retries/token_bucket.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -266,14 +266,10 @@ mod tests {
266266
assert!(permit.is_some());
267267
permits.push(permit);
268268
// Available permits should stay constant
269-
<<<<<<< HEAD
270269
assert_eq!(
271-
tokio::sync::Semaphore::MAX_PERMITS,
270+
MAXIMUM_CAPACITY,
272271
bucket.semaphore.available_permits()
273272
);
274-
=======
275-
assert_eq!(MAXIMUM_CAPACITY, bucket.semaphore.available_permits());
276-
>>>>>>> fdf7e2a42 (Moving max capacity for semaphore below max value on 32 bit system)
277273
}
278274
}
279275

0 commit comments

Comments
 (0)