Trying to fix rust compat

crates/librqbit/src/limits.rs

@@ -3,29 +3,28 @@ use governor::DefaultDirectRateLimiter as RateLimiter;
 use governor::Quota;
 use serde::Deserialize;
 use serde::Serialize;
-use std::num::NonZero;
 use std::num::NonZeroU32;
 use std::sync::Arc;
 
 #[derive(Default, Serialize, Deserialize, Clone, Copy, Debug, PartialEq, Eq)]
 pub struct LimitsConfig {
-    pub upload_bps: Option<NonZero<u32>>,
-    pub download_bps: Option<NonZero<u32>>,
+    pub upload_bps: Option<NonZeroU32>,
+    pub download_bps: Option<NonZeroU32>,
 }
 
 struct Limit(ArcSwapOption<RateLimiter>);
 
 impl Limit {
-    fn new_inner(bps: Option<NonZero<u32>>) -> Option<Arc<RateLimiter>> {
+    fn new_inner(bps: Option<NonZeroU32>) -> Option<Arc<RateLimiter>> {
         let bps = bps?;
         Some(Arc::new(RateLimiter::direct(Quota::per_second(bps))))
     }
 
-    fn new(bps: Option<NonZero<u32>>) -> Self {
+    fn new(bps: Option<NonZeroU32>) -> Self {
         Self(ArcSwapOption::new(Self::new_inner(bps)))
     }
 
-    async fn acquire(&self, size: NonZero<u32>) -> anyhow::Result<()> {
+    async fn acquire(&self, size: NonZeroU32) -> anyhow::Result<()> {
         let lim = self.0.load().clone();
         if let Some(rl) = lim.as_ref() {
             rl.until_n_ready(size).await?;
@@ -33,7 +32,7 @@ impl Limit {
         Ok(())
     }
 
-    fn set(&self, limit: Option<NonZero<u32>>) {
+    fn set(&self, limit: Option<NonZeroU32>) {
         let new = Self::new_inner(limit);
         self.0.swap(new);
     }
@@ -52,15 +51,15 @@ impl Limits {
         }
     }
 
-    pub async fn prepare_for_upload(&self, len: NonZero<u32>) -> anyhow::Result<()> {
+    pub async fn prepare_for_upload(&self, len: NonZeroU32) -> anyhow::Result<()> {
         self.up.acquire(len).await
     }
 
-    pub async fn prepare_for_download(&self, len: NonZero<u32>) -> anyhow::Result<()> {
+    pub async fn prepare_for_download(&self, len: NonZeroU32) -> anyhow::Result<()> {
         self.down.acquire(len).await
     }
 
-    pub fn set_upload_bps(&self, bps: Option<NonZero<u32>>) {
+    pub fn set_upload_bps(&self, bps: Option<NonZeroU32>) {
         self.up.set(bps);
     }