Upgrade lints

smoelius · smoelius · commit 017fc41ffd7b · 2022-08-14T12:08:47.000-04:00
diff --git a/lints/arbitrary_cpi/Cargo.lock b/lints/arbitrary_cpi/Cargo.lock
diff --git a/lints/arbitrary_cpi/Cargo.toml b/lints/arbitrary_cpi/Cargo.toml
@@ -26,7 +26,7 @@ name = "secure"
 path = "ui/secure/src/lib.rs"
 
 [dependencies]
-clippy_utils = { git = "https://github.com/rust-lang/rust-clippy", rev = "0cb0f7636851f9fcc57085cf80197a2ef6db098f" }
+clippy_utils = { git = "https://github.com/rust-lang/rust-clippy", rev = "2b2190cb5667cdd276a24ef8b9f3692209c54a89" }
 dylint_linting = "2.0.1"
 if_chain = "1.0.2"
 solana-lints = { path = "../../crate" }
diff --git a/lints/arbitrary_cpi/rust-toolchain b/lints/arbitrary_cpi/rust-toolchain
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2022-06-30"
+channel = "nightly-2022-08-11"
 components = ["llvm-tools-preview", "rustc-dev"]
diff --git a/lints/arbitrary_cpi/src/lib.rs b/lints/arbitrary_cpi/src/lib.rs
@@ -8,8 +8,9 @@ use rustc_lint::{LateContext, LateLintPass};
 
 use rustc_middle::{
     mir,
-    mir::terminator::TerminatorKind,
-    mir::{BasicBlock, Local, Operand, Place, ProjectionElem, Rvalue, StatementKind},
+    mir::{
+        BasicBlock, Local, Operand, Place, ProjectionElem, Rvalue, StatementKind, TerminatorKind,
+    },
     ty::TyKind,
 };
 use rustc_span::symbol::Symbol;
@@ -142,7 +143,7 @@ impl ArbitraryCpi {
         block: BasicBlock,
         mut inst_arg: &Place<'tcx>,
     ) -> (bool, Vec<Place<'tcx>>) {
-        let preds = body.predecessors();
+        let preds = body.basic_blocks.predecessors();
         let bbs = body.basic_blocks();
         let mut cur_block = block;
         let mut found_program_id = false;
@@ -261,7 +262,7 @@ impl ArbitraryCpi {
         mut search_place: &Place<'tcx>,
         search_list: &[Local],
     ) -> bool {
-        let preds = body.predecessors();
+        let preds = body.basic_blocks.predecessors();
         let bbs = body.basic_blocks();
         let mut cur_block = block;
         if let Some(search_loc) = search_place.local_or_deref_local() {
@@ -313,7 +314,7 @@ impl ArbitraryCpi {
         block: BasicBlock,
         programid_locals: &[Local],
     ) -> bool {
-        let preds = body.predecessors();
+        let preds = body.basic_blocks.predecessors();
         let bbs = body.basic_blocks();
         let mut cur_block = block;
         loop {
@@ -339,7 +340,10 @@ impl ArbitraryCpi {
                     {
                         // we found the check. if it dominates the call to invoke, then the check
                         // is assumed to be sufficient!
-                        return body.dominators().is_dominated_by(block, cur_block);
+                        return body
+                            .basic_blocks
+                            .dominators()
+                            .is_dominated_by(block, cur_block);
                     }
                 }
             }
diff --git a/lints/insecure_account_close/Cargo.lock b/lints/insecure_account_close/Cargo.lock
diff --git a/lints/insecure_account_close/Cargo.toml b/lints/insecure_account_close/Cargo.toml
@@ -30,7 +30,7 @@ name = "secure"
 path = "ui/secure/src/lib.rs"
 
 [dependencies]
-clippy_utils = { git = "https://github.com/rust-lang/rust-clippy", rev = "0cb0f7636851f9fcc57085cf80197a2ef6db098f" }
+clippy_utils = { git = "https://github.com/rust-lang/rust-clippy", rev = "2b2190cb5667cdd276a24ef8b9f3692209c54a89" }
 dylint_linting = "2.0.7"
 if_chain = "1.0.2"
 solana-lints = { path = "../../crate" }
diff --git a/lints/insecure_account_close/rust-toolchain b/lints/insecure_account_close/rust-toolchain
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2022-06-30"
+channel = "nightly-2022-08-11"
 components = ["llvm-tools-preview", "rustc-dev"]
diff --git a/lints/missing_owner_check/Cargo.lock b/lints/missing_owner_check/Cargo.lock
diff --git a/lints/missing_owner_check/Cargo.toml b/lints/missing_owner_check/Cargo.toml
@@ -26,7 +26,7 @@ name = "fixed-secure"
 path = "ui/fixed-secure/src/lib.rs"
 
 [dependencies]
-clippy_utils = { git = "https://github.com/rust-lang/rust-clippy", rev = "0cb0f7636851f9fcc57085cf80197a2ef6db098f" }
+clippy_utils = { git = "https://github.com/rust-lang/rust-clippy", rev = "2b2190cb5667cdd276a24ef8b9f3692209c54a89" }
 dylint_linting = "2.0.7"
 if_chain = "1.0.2"
 solana-lints = { path = "../../crate" }
diff --git a/lints/missing_owner_check/rust-toolchain b/lints/missing_owner_check/rust-toolchain
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2022-06-30"
+channel = "nightly-2022-08-11"
 components = ["llvm-tools-preview", "rustc-dev"]
diff --git a/lints/missing_signer_check/Cargo.lock b/lints/missing_signer_check/Cargo.lock
diff --git a/lints/missing_signer_check/Cargo.toml b/lints/missing_signer_check/Cargo.toml
@@ -22,7 +22,7 @@ name = "secure"
 path = "ui/secure/src/lib.rs"
 
 [dependencies]
-clippy_utils = { git = "https://github.com/rust-lang/rust-clippy", rev = "0cb0f7636851f9fcc57085cf80197a2ef6db098f" }
+clippy_utils = { git = "https://github.com/rust-lang/rust-clippy", rev = "2b2190cb5667cdd276a24ef8b9f3692209c54a89" }
 dylint_linting = "2.0.7"
 if_chain = "1.0.2"
 solana-lints = { path = "../../crate" }
diff --git a/lints/missing_signer_check/rust-toolchain b/lints/missing_signer_check/rust-toolchain
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2022-06-30"
+channel = "nightly-2022-08-11"
 components = ["llvm-tools-preview", "rustc-dev"]
diff --git a/lints/type_cosplay/Cargo.lock b/lints/type_cosplay/Cargo.lock
diff --git a/lints/type_cosplay/Cargo.toml b/lints/type_cosplay/Cargo.toml
@@ -34,7 +34,7 @@ name = "secure-2"
 path = "ui/secure-2/src/lib.rs"
 
 [dependencies]
-clippy_utils = { git = "https://github.com/rust-lang/rust-clippy", rev = "0cb0f7636851f9fcc57085cf80197a2ef6db098f" }
+clippy_utils = { git = "https://github.com/rust-lang/rust-clippy", rev = "2b2190cb5667cdd276a24ef8b9f3692209c54a89" }
 dylint_linting = "2.0.1"
 if_chain = "1.0.2"
 solana-lints = { path = "../../crate" }
diff --git a/lints/type_cosplay/rust-toolchain b/lints/type_cosplay/rust-toolchain
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2022-06-30"
+channel = "nightly-2022-08-11"
 components = ["llvm-tools-preview", "rustc-dev"]
diff --git a/rust-toolchain b/rust-toolchain
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2022-06-30"
+channel = "nightly-2022-08-11"
 components = ["llvm-tools-preview", "rustc-dev"]
diff --git a/scripts/upgrade_lints.sh b/scripts/upgrade_lints.sh
@@ -16,3 +16,5 @@ cd "$WORKSPACE"
 for X in lints/*; do
     cargo dylint --upgrade "$X"
 done
+
+cp lints/missing_signer_check/rust-toolchain .
