Update rust toolchain to nightly-2021-04-15 (tikv#10023)

* Update rust toolchain to nightly-2021-03-25

Signed-off-by: Andy Lok <[email protected]>

* Fix cliipy

Signed-off-by: Andy Lok <[email protected]>

* address comment

Signed-off-by: Andy Lok <[email protected]>

* update to nightly-2021-04-15

Signed-off-by: Andy Lok <[email protected]>

* format

Signed-off-by: Andy Lok <[email protected]>

* fix ci

Signed-off-by: Andy Lok <[email protected]>

* fix ci

Signed-off-by: Andy Lok <[email protected]>

* address comment

Signed-off-by: Andy Lok <[email protected]>

* address comment

Signed-off-by: Andy Lok <[email protected]>

* fix plugin segment fault

Signed-off-by: Andy Lok <[email protected]>

Co-authored-by: Ti Chi Robot <[email protected]>

Author: andylokandy

Cargo.lock

@@ -219,7 +219,6 @@ test_sst_importer = { path = "components/test_sst_importer", default-features =
 test_util = { path = "components/test_util", default-features = false }
 tokio = { version = "0.2", features = ["macros", "rt-threaded", "time"] }
 zipf = "6.1.0"
-example_plugin = { path = "components/test_coprocessor_plugin/example_plugin" }
 
 [patch.crates-io]
 # TODO: remove this when new raft-rs is published.

Cargo.toml

@@ -2381,7 +2381,7 @@ fn compact_whole_cluster(
         let mgr = Arc::clone(&mgr);
         let addr = s.address.clone();
         let (from, to) = (from.clone(), to.clone());
-        let cfs: Vec<String> = cfs.iter().map(|cf| (*cf).to_string()).collect();
+        let cfs: Vec<String> = cfs.iter().map(|cf| cf.to_string()).collect();
         let h = thread::Builder::new()
             .name(format!("compact-{}", addr))
             .spawn(move || {

cmd/tikv-ctl/src/main.rs

@@ -885,10 +885,7 @@ impl<T: 'static + RaftStoreRouter<RocksEngine>> Endpoint<T> {
             })
             .collect();
         let resps = futures::future::join_all(regions).await;
-        resps
-            .into_iter()
-            .filter_map(|resp| resp)
-            .collect::<Vec<u64>>()
+        resps.into_iter().flatten().collect::<Vec<u64>>()
     }
 
     async fn region_resolved_ts_store(
@@ -1387,8 +1384,8 @@ impl Initializer {
 
         if let Some(resolver) = resolver {
             // Track the locks.
-            for entry in &entries {
-                if let Some(TxnEntry::Prewrite { lock, .. }) = entry {
+            for entry in entries.iter().flatten() {
+                if let TxnEntry::Prewrite { lock, .. } = entry {
                     let (encoded_key, value) = lock;
                     let key = Key::from_encoded_slice(encoded_key).into_raw().unwrap();
                     let lock = Lock::parse(value)?;

components/cdc/src/endpoint.rs

@@ -968,11 +968,10 @@ fn test_old_value_multi_changefeeds() {
                         if row.get_type() == EventLogType::Prewrite {
                             if row.get_start_ts() == ts3.into_inner() {
                                 assert_eq!(row.get_old_value(), b"v1");
-                                event_count += 1;
                             } else {
                                 assert_eq!(row.get_old_value(), b"");
-                                event_count += 1;
                             }
+                            event_count += 1;
                         }
                     }
                 }

components/cdc/tests/integrations/test_cdc.rs

@@ -54,7 +54,7 @@ pub fn new_event_feed(
         let mut events;
         {
             let mut event_feed = event_feed_wrap_clone.lock().unwrap();
-            events = (*event_feed).take();
+            events = event_feed.take();
         }
         let events_rx = if let Some(events_rx) = events.as_mut() {
             events_rx

components/cdc/tests/mod.rs

@@ -22,10 +22,12 @@ pub type PluginConstructorSignature =
 #[macro_export]
 macro_rules! declare_plugin {
     ($plugin_ctor:expr) => {
+        #[cfg(not(test))]
         #[global_allocator]
         static HOST_ALLOCATOR: $crate::allocator::HostAllocator =
             $crate::allocator::HostAllocator::new();
 
+        #[cfg(not(test))]
         #[no_mangle]
         pub unsafe extern "C" fn _plugin_create(
             host_allocator: $crate::allocator::HostAllocatorPtr,

components/coprocessor_plugin_api/src/util.rs

@@ -249,7 +249,7 @@ mod tests {
         assert_eq!(ivs.len(), 100);
 
         for iv in ivs {
-            let iv1 = Iv::from_slice(&iv.as_slice()[..]).unwrap();
+            let iv1 = Iv::from_slice(iv.as_slice()).unwrap();
             assert_eq!(iv.as_slice(), iv1.as_slice());
         }
     }

components/encryption/src/crypter.rs

@@ -73,7 +73,7 @@ pub type Result<T> = result::Result<T, Error>;
 impl ErrorCodeExt for Error {
     fn error_code(&self) -> ErrorCode {
         match self {
-            Error::RetryCodedError(err) => (*err).error_code(),
+            Error::RetryCodedError(err) => err.error_code(),
             Error::TailRecordParseIncomplete => error_code::encryption::PARSE_INCOMPLETE,
             Error::Rocks(_) => error_code::encryption::ROCKS,
             Error::Io(_) => error_code::encryption::IO,

components/encryption/src/errors.rs

@@ -202,7 +202,7 @@ pub(crate) fn db_exist(path: &str) -> bool {
 /// Returns a Vec of cf which is in `a' but not in `b'.
 fn cfs_diff<'a>(a: &[&'a str], b: &[&str]) -> Vec<&'a str> {
     a.iter()
-        .filter(|x| b.iter().find(|y| y == x).is_none())
+        .filter(|x| !b.iter().any(|y| *x == y))
         .cloned()
         .collect()
 }