More clippy changes

.github/workflows/clippy_test.yml

@@ -28,7 +28,7 @@ jobs:
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           # use toolchain version from rust-toolchain.toml
-          toolchain: nightly
+          toolchain: +nightly-2024-01-05
           components: rustfmt, clippy
           cache: true
           # avoid the default "-D warnings" which thrashes cache
@@ -48,5 +48,5 @@ jobs:
 
       - name: Run fmt+clippy
         run: |
-          cargo +nightly fmt --all --check
-          cargo +nightly clippy --locked --workspace --all-targets -- -D warnings
+          cargo +nightly-2024-01-05 fmt --all --check
+          cargo +nightly-2024-01-05 clippy --locked --workspace --all-targets -- -D warnings

cluster-endpoints/src/grpc_subscription.rs

@@ -47,21 +47,13 @@ pub fn map_block_update(
         .transactions
         .into_iter()
         .filter_map(|tx| {
-            let Some(meta) = tx.meta else {
-                return None;
-            };
+            let meta = tx.meta?;
 
-            let Some(transaction) = tx.transaction else {
-                return None;
-            };
+            let transaction = tx.transaction?;
 
-            let Some(message) = transaction.message else {
-                return None;
-            };
+            let message = transaction.message?;
 
-            let Some(header) = message.header else {
-                return None;
-            };
+            let header = message.header?;
 
             let signatures = transaction
                 .signatures

core/src/stores/block_information_store.rs

@@ -58,9 +58,7 @@ impl BlockInformationStore {
     }
 
     pub fn get_block_info(&self, blockhash: &str) -> Option<BlockInformation> {
-        let Some(info) = self.blocks.get(blockhash) else {
-            return None;
-        };
+        let info = self.blocks.get(blockhash)?;
 
         Some(info.value().to_owned())
     }

run_clippy_fmt.sh

@@ -0,0 +1,2 @@
+cargo +nightly-2024-01-05 fmt --all
+cargo +nightly-2024-01-05 clippy --locked --workspace --all-targets -- -D warnings