update packages and fix lints

Signed-off-by: tabokie <xy.tao@outlook.com>
tikv · Jun 13, 2022 · 7d73256 · 7d73256
1 parent 1bb8267
commit 7d73256
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 43 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/components/coprocessor_plugin_api/src/lib.rs b/components/coprocessor_plugin_api/src/lib.rs
@@ -1,5 +1,4 @@
 // Copyright 2021 TiKV Project Authors. Licensed under Apache-2.0.
-#![feature(const_fn_fn_ptr_basics)]
 
 //! This crate contains some necessary types and traits for implementing a custom coprocessor plugin
 //! for TiKV.

diff --git a/components/encryption/src/encrypted_file/mod.rs b/components/encryption/src/encrypted_file/mod.rs
@@ -127,7 +127,6 @@ mod tests {
 
         let content = b"test content";
         file.write(content, &PlaintextBackend::default()).unwrap();
-        drop(file);
 
         let file = EncryptedFile::new(tmp.path(), "encrypted");
         assert_eq!(file.read(&PlaintextBackend::default()).unwrap(), content);

diff --git a/components/raftstore/src/lib.rs b/components/raftstore/src/lib.rs
@@ -6,7 +6,6 @@
 #![feature(min_specialization)]
 #![feature(box_patterns)]
 #![feature(hash_drain_filter)]
-#![feature(vec_retain_mut)]
 #![recursion_limit = "256"]
 
 #[cfg(test)]

diff --git a/components/tidb_query_executors/src/lib.rs b/components/tidb_query_executors/src/lib.rs
@@ -10,8 +10,6 @@
 #![allow(incomplete_features)]
 #![feature(proc_macro_hygiene)]
 #![feature(specialization)]
-#![feature(const_fn_fn_ptr_basics)]
-#![feature(const_fn_trait_bound)]
 #![feature(const_mut_refs)]
 
 #[macro_use(box_try, warn)]

diff --git a/components/tidb_query_expr/src/lib.rs b/components/tidb_query_expr/src/lib.rs
@@ -12,8 +12,6 @@
 #![feature(proc_macro_hygiene)]
 #![feature(specialization)]
 #![feature(test)]
-#![feature(const_fn_fn_ptr_basics)]
-#![feature(const_fn_trait_bound)]
 #![feature(const_mut_refs)]
 
 #[macro_use(box_err, box_try, try_opt)]

diff --git a/components/tikv_alloc/src/lib.rs b/components/tikv_alloc/src/lib.rs
@@ -134,8 +134,8 @@ mod runner {
     extern crate test;
     use test::*;
 
-    /// Check for test cases with ignore message "#ifdef <VAR_NAME>". The test
-    /// case will be un-ignored if the specific environment variable is set.
+    /// Check for ignored test cases with ignore message "#ifdef <VAR_NAME>". The test
+    /// case will be enabled if the specific environment variable is set.
     pub fn run_env_conditional_tests(cases: &[&TestDescAndFn]) {
         let cases: Vec<_> = cases
             .iter()
@@ -148,9 +148,8 @@ mod runner {
                 };
                 if let Some(msg) = desc.ignore_message {
                     let keyword = "#ifdef";
-                    if let Some(idx) = msg.find(keyword) {
-                        let v = &msg[idx + keyword.len()..].trim();
-                        if v.is_empty() || std::env::var(v).is_ok() {
+                    if let Some(var_name) = msg.strip_prefix(keyword) {
+                        if var_name.is_empty() || std::env::var(var_name).is_ok() {
                             desc.ignore = false;
                             desc.ignore_message = None;
                         }

diff --git a/src/import/sst_service.rs b/src/import/sst_service.rs
@@ -295,7 +295,7 @@ macro_rules! impl_write {
                     Ok(resp)
                 }
                 .await;
-                crate::send_rpc_response!(res, sink, label, timer);
+                $crate::send_rpc_response!(res, sink, label, timer);
             };
 
             self.threads.spawn_ok(buf_driver);

diff --git a/src/server/service/mod.rs b/src/server/service/mod.rs
@@ -18,7 +18,7 @@ pub use self::{
 macro_rules! log_net_error {
     ($err:expr, $($args:tt)*) => {{
         let e = $err;
-        if let crate::server::Error::Grpc(e) = e {
+        if let $crate::server::Error::Grpc(e) = e {
             info!($($args)*, "err" => %e);
         } else {
             debug!($($args)*, "err" => %e);

diff --git a/src/storage/mod.rs b/src/storage/mod.rs
@@ -2691,10 +2691,7 @@ pub struct TxnTestSnapshot<S: Snapshot> {
 
 impl<S: Snapshot> Snapshot for TxnTestSnapshot<S> {
     type Iter = S::Iter;
-    type Ext<'a>
-    where
-        S: 'a,
-    = TxnTestSnapshotExt<'a>;
+    type Ext<'a> = TxnTestSnapshotExt<'a> where S: 'a;
 
     fn get(&self, key: &Key) -> tikv_kv::Result<Option<Value>> {
         self.snapshot.get(key)

diff --git a/src/storage/raw/encoded.rs b/src/storage/raw/encoded.rs
@@ -61,10 +61,7 @@ impl<S: Snapshot, F: KvFormat> RawEncodeSnapshot<S, F> {
 
 impl<S: Snapshot, F: KvFormat> Snapshot for RawEncodeSnapshot<S, F> {
     type Iter = RawEncodeIterator<S::Iter, F>;
-    type Ext<'a>
-    where
-        S: 'a,
-    = S::Ext<'a>;
+    type Ext<'a> = S::Ext<'a> where S: 'a;
 
     fn get(&self, key: &Key) -> Result<Option<Value>> {
         self.map_value(self.snap.get(key))

diff --git a/src/storage/raw/raw_mvcc.rs b/src/storage/raw/raw_mvcc.rs
@@ -43,10 +43,7 @@ impl<S: Snapshot> RawMvccSnapshot<S> {
 
 impl<S: Snapshot> Snapshot for RawMvccSnapshot<S> {
     type Iter = RawMvccIterator<S::Iter>;
-    type Ext<'a>
-    where
-        S: 'a,
-    = S::Ext<'a>;
+    type Ext<'a> = S::Ext<'a> where S: 'a;
 
     fn get(&self, key: &Key) -> Result<Option<Value>> {
         self.seek_first_key_value_cf(None, None, key)