*: make clippy happy (#504)

Signed-off-by: Jay Lee <[email protected]>

Author: BusyJay

compiler/src/util.rs

@@ -34,7 +34,7 @@ impl<'a> Iterator for NameSpliter<'a> {
         let mut meet_lower = false;
         for i in self.pos..self.name.len() {
             let c = self.name[i];
-            if b'A' <= c && c <= b'Z' {
+            if (b'A'..=b'Z').contains(&c) {
                 if meet_lower {
                     // So it should be AaA or aaA
                     pos = i;

src/call/client.rs

@@ -399,7 +399,7 @@ impl<Req> Sink<(Req, WriteFlags)> for StreamingCallSink<Req> {
             t.close_f = Some(close_f);
         }
 
-        if let Poll::Pending = Pin::new(t.close_f.as_mut().unwrap()).poll(cx)? {
+        if Pin::new(t.close_f.as_mut().unwrap()).poll(cx)?.is_pending() {
             // if call is finished, can return early here.
             call.check_alive()?;
             return Poll::Pending;

src/call/mod.rs

@@ -533,7 +533,7 @@ impl StreamingBase {
         if !skip_finish_check {
             let mut finished = false;
             if let Some(close_f) = &mut self.close_f {
-                if let Poll::Ready(_) = Pin::new(close_f).poll(cx)? {
+                if Pin::new(close_f).poll(cx)?.is_ready() {
                     // Don't return immediately, there may be pending data.
                     finished = true;
                 }

src/cq.rs

@@ -36,35 +36,39 @@ impl CompletionQueueHandle {
     }
 
     fn add_ref(&self) -> Result<()> {
+        let mut cnt = self.ref_cnt.load(Ordering::SeqCst);
         loop {
-            let cnt = self.ref_cnt.load(Ordering::SeqCst);
             if cnt <= 0 {
                 // `shutdown` has been called, reject any requests.
                 return Err(Error::QueueShutdown);
             }
             let new_cnt = cnt + 1;
-            if cnt
-                == self
-                    .ref_cnt
-                    .compare_and_swap(cnt, new_cnt, Ordering::SeqCst)
-            {
-                return Ok(());
+            match self.ref_cnt.compare_exchange_weak(
+                cnt,
+                new_cnt,
+                Ordering::SeqCst,
+                Ordering::SeqCst,
+            ) {
+                Ok(_) => return Ok(()),
+                Err(c) => cnt = c,
             }
         }
     }
 
     fn unref(&self) {
+        let mut cnt = self.ref_cnt.load(Ordering::SeqCst);
         let shutdown = loop {
-            let cnt = self.ref_cnt.load(Ordering::SeqCst);
             // If `shutdown` is not called, `cnt` > 0, so minus 1 to unref.
             // If `shutdown` is called, `cnt` < 0, so plus 1 to unref.
             let new_cnt = cnt - cnt.signum();
-            if cnt
-                == self
-                    .ref_cnt
-                    .compare_and_swap(cnt, new_cnt, Ordering::SeqCst)
-            {
-                break new_cnt == 0;
+            match self.ref_cnt.compare_exchange_weak(
+                cnt,
+                new_cnt,
+                Ordering::SeqCst,
+                Ordering::SeqCst,
+            ) {
+                Ok(_) => break new_cnt == 0,
+                Err(c) => cnt = c,
             }
         };
         if shutdown {
@@ -75,8 +79,8 @@ impl CompletionQueueHandle {
     }
 
     fn shutdown(&self) {
+        let mut cnt = self.ref_cnt.load(Ordering::SeqCst);
         let shutdown = loop {
-            let cnt = self.ref_cnt.load(Ordering::SeqCst);
             if cnt <= 0 {
                 // `shutdown` is called, skipped.
                 return;
@@ -85,12 +89,14 @@ impl CompletionQueueHandle {
             // Because `cnt` is initialized to 1, so minus 1 to make it reach
             // toward 0. That is `new_cnt = -(cnt - 1) = -cnt + 1`.
             let new_cnt = -cnt + 1;
-            if cnt
-                == self
-                    .ref_cnt
-                    .compare_and_swap(cnt, new_cnt, Ordering::SeqCst)
-            {
-                break new_cnt == 0;
+            match self.ref_cnt.compare_exchange_weak(
+                cnt,
+                new_cnt,
+                Ordering::SeqCst,
+                Ordering::SeqCst,
+            ) {
+                Ok(_) => break new_cnt == 0,
+                Err(c) => cnt = c,
             }
         };
         if shutdown {

src/metadata.rs

@@ -16,11 +16,11 @@ fn normalize_key(key: &str, binary: bool) -> Result<Cow<'_, str>> {
     let mut is_upper_case = false;
     for b in key.as_bytes() {
         let b = *b;
-        if b >= b'A' && b <= b'Z' {
+        if (b'A'..=b'Z').contains(&b) {
             is_upper_case = true;
             continue;
-        } else if b >= b'a' && b <= b'z'
-            || b >= b'0' && b <= b'9'
+        } else if (b'a'..=b'z').contains(&b)
+            || (b'0'..=b'9').contains(&b)
             || b == b'_'
             || b == b'-'
             || b == b'.'
@@ -83,10 +83,10 @@ impl MetadataBuilder {
             }
         }
         let key = normalize_key(key, false)?;
-        self.add_metadata(&key, value.as_bytes())
+        Ok(self.add_metadata(&key, value.as_bytes()))
     }
 
-    fn add_metadata(&mut self, key: &str, value: &[u8]) -> Result<&mut MetadataBuilder> {
+    fn add_metadata(&mut self, key: &str, value: &[u8]) -> &mut MetadataBuilder {
         unsafe {
             grpc_sys::grpcwrap_metadata_array_add(
                 &mut self.arr.0,
@@ -96,15 +96,15 @@ impl MetadataBuilder {
                 value.len(),
             )
         }
-        Ok(self)
+        self
     }
 
     /// Add a metadata holding a binary value.
     ///
     /// `key` needs to have suffix (-bin) indicating a binary valued metadata entry.
     pub fn add_bytes(&mut self, key: &str, value: &[u8]) -> Result<&mut MetadataBuilder> {
         let key = normalize_key(key, true)?;
-        self.add_metadata(&key, value)
+        Ok(self.add_metadata(&key, value))
     }
 
     /// Create `Metadata` with configured entries.
@@ -221,7 +221,7 @@ impl Clone for Metadata {
         let mut builder = MetadataBuilder::with_capacity(self.len());
         for (k, v) in self.iter() {
             // use `add_metadata` to skip validation.
-            builder.add_metadata(k, v).unwrap();
+            builder.add_metadata(k, v);
         }
         builder.build()
     }