Upgrade examples (unscheduled)

Upgrade examples to `nightly-2022-07-28` and `clippy_utils` `3c7e7db` to eliminate Cargo-emitted warning. See: rust-lang/rust-clippy#9216
trailofbits · Aug 3, 2022 · f09ef85 · f09ef85
1 parent d517652
commit f09ef85
Show file tree

Hide file tree

Showing 42 changed files with 48 additions and 48 deletions.
diff --git a/examples/general/await_holding_span_guard/Cargo.lock b/examples/general/await_holding_span_guard/Cargo.lock
diff --git a/examples/general/await_holding_span_guard/Cargo.toml b/examples/general/await_holding_span_guard/Cargo.toml
@@ -14,7 +14,7 @@ name = "ui"
 path = "ui/main.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 = "3c7e7dbc1583a0b06df5bd7623dd354a4debd23d" }
 
 dylint_linting = { path = "../../../utils/linting" }
 

diff --git a/examples/general/await_holding_span_guard/rust-toolchain b/examples/general/await_holding_span_guard/rust-toolchain
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2022-06-30"
+channel = "nightly-2022-07-28"
 components = ["llvm-tools-preview", "rustc-dev"]
diff --git a/examples/general/crate_wide_allow/Cargo.lock b/examples/general/crate_wide_allow/Cargo.lock
diff --git a/examples/general/crate_wide_allow/Cargo.toml b/examples/general/crate_wide_allow/Cargo.toml
@@ -14,7 +14,7 @@ name = "ui"
 path = "ui/main.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 = "3c7e7dbc1583a0b06df5bd7623dd354a4debd23d" }
 if_chain = "1.0.2"
 
 dylint_linting = { path = "../../../utils/linting" }

diff --git a/examples/general/crate_wide_allow/rust-toolchain b/examples/general/crate_wide_allow/rust-toolchain
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2022-06-30"
+channel = "nightly-2022-07-28"
 components = ["llvm-tools-preview", "rustc-dev"]
diff --git a/examples/general/env_cargo_path/Cargo.lock b/examples/general/env_cargo_path/Cargo.lock
diff --git a/examples/general/env_cargo_path/Cargo.toml b/examples/general/env_cargo_path/Cargo.toml
@@ -10,7 +10,7 @@ publish = false
 crate-type = ["cdylib"]
 
 [dependencies]
-clippy_utils = { git = "https://github.com/rust-lang/rust-clippy", rev = "0cb0f7636851f9fcc57085cf80197a2ef6db098f" }
+clippy_utils = { git = "https://github.com/rust-lang/rust-clippy", rev = "3c7e7dbc1583a0b06df5bd7623dd354a4debd23d" }
 if_chain = "1.0.2"
 
 dylint_linting = { path = "../../../utils/linting" }

diff --git a/examples/general/env_cargo_path/rust-toolchain b/examples/general/env_cargo_path/rust-toolchain
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2022-06-30"
+channel = "nightly-2022-07-28"
 components = ["llvm-tools-preview", "rustc-dev"]
diff --git a/examples/general/non_thread_safe_call_in_test/Cargo.lock b/examples/general/non_thread_safe_call_in_test/Cargo.lock
diff --git a/examples/general/non_thread_safe_call_in_test/Cargo.toml b/examples/general/non_thread_safe_call_in_test/Cargo.toml
@@ -22,7 +22,7 @@ name = "set_current_dir"
 path = "ui_late/set_current_dir.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 = "3c7e7dbc1583a0b06df5bd7623dd354a4debd23d" }
 if_chain = "1.0.2"
 
 dylint_internal = { path = "../../../internal" }

diff --git a/examples/general/non_thread_safe_call_in_test/rust-toolchain b/examples/general/non_thread_safe_call_in_test/rust-toolchain
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2022-06-30"
+channel = "nightly-2022-07-28"
 components = ["llvm-tools-preview", "rustc-dev"]
diff --git a/examples/general/non_thread_safe_call_in_test/src/late.rs b/examples/general/non_thread_safe_call_in_test/src/late.rs
@@ -6,7 +6,7 @@ use if_chain::if_chain;
 use rustc_hir::{
     def_id::{DefId, LocalDefId},
     intravisit::{walk_body, walk_expr, Visitor},
-    Expr, ExprKind, Item, ItemKind,
+    Closure, Expr, ExprKind, Item, ItemKind,
 };
 use rustc_lint::{LateContext, LateLintPass};
 use rustc_middle::hir::nested_filter;
@@ -89,11 +89,11 @@ impl NonThreadSafeCallInTest {
                 if let Some(testfn) = fields.iter().find(|field| field.ident.as_str() == "testfn");
                 // smoelius: Callee is `self::test::StaticTestFn`.
                 if let ExprKind::Call(_, [arg]) = testfn.expr.kind;
-                if let ExprKind::Closure {
+                if let ExprKind::Closure(Closure {
                     body: closure_body_id,
                     ..
-                } = arg.kind;
-                let closure_body = cx.tcx.hir().body(closure_body_id);
+                }) = arg.kind;
+                let closure_body = cx.tcx.hir().body(*closure_body_id);
                 // smoelius: Callee is `self::test::assert_test_result`.
                 if let ExprKind::Call(_, [arg]) = closure_body.value.kind;
                 // smoelius: Callee is test function.

diff --git a/examples/general/redundant_reference/Cargo.lock b/examples/general/redundant_reference/Cargo.lock
diff --git a/examples/general/redundant_reference/Cargo.toml b/examples/general/redundant_reference/Cargo.toml
@@ -10,7 +10,7 @@ publish = false
 crate-type = ["cdylib"]
 
 [dependencies]
-clippy_utils = { git = "https://github.com/rust-lang/rust-clippy", rev = "0cb0f7636851f9fcc57085cf80197a2ef6db098f" }
+clippy_utils = { git = "https://github.com/rust-lang/rust-clippy", rev = "3c7e7dbc1583a0b06df5bd7623dd354a4debd23d" }
 if_chain = "1.0.2"
 
 dylint_internal = { path = "../../../internal" }

diff --git a/examples/general/redundant_reference/rust-toolchain b/examples/general/redundant_reference/rust-toolchain
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2022-06-30"
+channel = "nightly-2022-07-28"
 components = ["llvm-tools-preview", "rustc-dev"]
diff --git a/examples/restriction/env_literal/Cargo.lock b/examples/restriction/env_literal/Cargo.lock
diff --git a/examples/restriction/env_literal/Cargo.toml b/examples/restriction/env_literal/Cargo.toml
@@ -10,7 +10,7 @@ publish = false
 crate-type = ["cdylib"]
 
 [dependencies]
-clippy_utils = { git = "https://github.com/rust-lang/rust-clippy", rev = "0cb0f7636851f9fcc57085cf80197a2ef6db098f" }
+clippy_utils = { git = "https://github.com/rust-lang/rust-clippy", rev = "3c7e7dbc1583a0b06df5bd7623dd354a4debd23d" }
 if_chain = "1.0.2"
 
 dylint_internal = { path = "../../../internal" }

diff --git a/examples/restriction/env_literal/rust-toolchain b/examples/restriction/env_literal/rust-toolchain
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2022-06-30"
+channel = "nightly-2022-07-28"
 components = ["llvm-tools-preview", "rustc-dev"]
diff --git a/examples/restriction/inconsistent_qualification/Cargo.lock b/examples/restriction/inconsistent_qualification/Cargo.lock
diff --git a/examples/restriction/inconsistent_qualification/Cargo.toml b/examples/restriction/inconsistent_qualification/Cargo.toml
@@ -10,7 +10,7 @@ publish = false
 crate-type = ["cdylib"]
 
 [dependencies]
-clippy_utils = { git = "https://github.com/rust-lang/rust-clippy", rev = "0cb0f7636851f9fcc57085cf80197a2ef6db098f" }
+clippy_utils = { git = "https://github.com/rust-lang/rust-clippy", rev = "3c7e7dbc1583a0b06df5bd7623dd354a4debd23d" }
 if_chain = "1.0.2"
 
 dylint_linting = { path = "../../../utils/linting" }

diff --git a/examples/restriction/inconsistent_qualification/rust-toolchain b/examples/restriction/inconsistent_qualification/rust-toolchain
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2022-06-30"
+channel = "nightly-2022-07-28"
 components = ["llvm-tools-preview", "rustc-dev"]
diff --git a/examples/restriction/path_separator_in_string_literal/Cargo.lock b/examples/restriction/path_separator_in_string_literal/Cargo.lock
diff --git a/examples/restriction/path_separator_in_string_literal/Cargo.toml b/examples/restriction/path_separator_in_string_literal/Cargo.toml
@@ -10,7 +10,7 @@ publish = false
 crate-type = ["cdylib"]
 
 [dependencies]
-clippy_utils = { git = "https://github.com/rust-lang/rust-clippy", rev = "0cb0f7636851f9fcc57085cf80197a2ef6db098f" }
+clippy_utils = { git = "https://github.com/rust-lang/rust-clippy", rev = "3c7e7dbc1583a0b06df5bd7623dd354a4debd23d" }
 if_chain = "1.0.2"
 
 dylint_internal = { path = "../../../internal" }

diff --git a/examples/restriction/path_separator_in_string_literal/rust-toolchain b/examples/restriction/path_separator_in_string_literal/rust-toolchain
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2022-06-30"
+channel = "nightly-2022-07-28"
 components = ["llvm-tools-preview", "rustc-dev"]
diff --git a/examples/restriction/question_mark_in_expression/Cargo.lock b/examples/restriction/question_mark_in_expression/Cargo.lock
diff --git a/examples/restriction/question_mark_in_expression/Cargo.toml b/examples/restriction/question_mark_in_expression/Cargo.toml
@@ -18,7 +18,7 @@ name = "ls"
 path = "ui/ls.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 = "3c7e7dbc1583a0b06df5bd7623dd354a4debd23d" }
 if_chain = "1.0.2"
 
 dylint_linting = { path = "../../../utils/linting" }

diff --git a/examples/restriction/question_mark_in_expression/rust-toolchain b/examples/restriction/question_mark_in_expression/rust-toolchain
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2022-06-30"
+channel = "nightly-2022-07-28"
 components = ["llvm-tools-preview", "rustc-dev"]
diff --git a/examples/restriction/suboptimal_pattern/Cargo.lock b/examples/restriction/suboptimal_pattern/Cargo.lock
diff --git a/examples/restriction/suboptimal_pattern/Cargo.toml b/examples/restriction/suboptimal_pattern/Cargo.toml
@@ -10,7 +10,7 @@ publish = false
 crate-type = ["cdylib"]
 
 [dependencies]
-clippy_utils = { git = "https://github.com/rust-lang/rust-clippy", rev = "0cb0f7636851f9fcc57085cf80197a2ef6db098f" }
+clippy_utils = { git = "https://github.com/rust-lang/rust-clippy", rev = "3c7e7dbc1583a0b06df5bd7623dd354a4debd23d" }
 if_chain = "1.0.2"
 
 dylint_internal = { path = "../../../internal" }

diff --git a/examples/restriction/suboptimal_pattern/rust-toolchain b/examples/restriction/suboptimal_pattern/rust-toolchain
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2022-06-30"
+channel = "nightly-2022-07-28"
 components = ["llvm-tools-preview", "rustc-dev"]
diff --git a/examples/restriction/try_io_result/Cargo.lock b/examples/restriction/try_io_result/Cargo.lock
diff --git a/examples/restriction/try_io_result/Cargo.toml b/examples/restriction/try_io_result/Cargo.toml
@@ -14,7 +14,7 @@ name = "ui"
 path = "ui/main.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 = "3c7e7dbc1583a0b06df5bd7623dd354a4debd23d" }
 if_chain = "1.0.2"
 
 dylint_internal = { path = "../../../internal" }

diff --git a/examples/restriction/try_io_result/rust-toolchain b/examples/restriction/try_io_result/rust-toolchain
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2022-06-30"
+channel = "nightly-2022-07-28"
 components = ["llvm-tools-preview", "rustc-dev"]
diff --git a/examples/testing/clippy/Cargo.lock b/examples/testing/clippy/Cargo.lock
diff --git a/examples/testing/clippy/Cargo.toml b/examples/testing/clippy/Cargo.toml
@@ -10,8 +10,8 @@ publish = false
 crate-type = ["cdylib"]
 
 [dependencies]
-clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", rev = "0cb0f7636851f9fcc57085cf80197a2ef6db098f" }
-clippy_utils = { git = "https://github.com/rust-lang/rust-clippy", rev = "0cb0f7636851f9fcc57085cf80197a2ef6db098f" }
+clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", rev = "3c7e7dbc1583a0b06df5bd7623dd354a4debd23d" }
+clippy_utils = { git = "https://github.com/rust-lang/rust-clippy", rev = "3c7e7dbc1583a0b06df5bd7623dd354a4debd23d" }
 serde_json = "1.0.82"
 
 dylint_internal = { path = "../../../internal" }

diff --git a/examples/testing/clippy/rust-toolchain b/examples/testing/clippy/rust-toolchain
@@ -1,4 +1,4 @@
 [toolchain]
-channel = "nightly-2022-06-30"
+channel = "nightly-2022-07-28"
 # smoelius: The `or_fun_call` test passes only if `rust-src` is installed.
 components = ["llvm-tools-preview", "rustc-dev", "rust-src"]
diff --git a/examples/testing/straggler/Cargo.lock b/examples/testing/straggler/Cargo.lock
diff --git a/examples/testing/straggler/Cargo.toml b/examples/testing/straggler/Cargo.toml
@@ -11,7 +11,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 # smoelius: `straggler` is intentionally held back for testing purposes.
-clippy_utils = { git = "https://github.com/rust-lang/rust-clippy", rev = "b312ad7d0cf0f30be2bd4658b71a3520a2e76709" }
+clippy_utils = { git = "https://github.com/rust-lang/rust-clippy", rev = "0cb0f7636851f9fcc57085cf80197a2ef6db098f" }
 
 dylint_linting = { path = "../../../utils/linting" }
 

diff --git a/examples/testing/straggler/rust-toolchain b/examples/testing/straggler/rust-toolchain
@@ -1,4 +1,4 @@
 [toolchain]
 # smoelius: `straggler` is intentionally held back for testing purposes.
-channel = "nightly-2022-05-19"
+channel = "nightly-2022-06-30"
 components = ["llvm-tools-preview", "rustc-dev"]
diff --git a/internal/template/Cargo.toml~ b/internal/template/Cargo.toml~
@@ -10,7 +10,7 @@ publish = false
 crate-type = ["cdylib"]
 
 [dependencies]
-clippy_utils = { git = "https://github.com/rust-lang/rust-clippy", rev = "0cb0f7636851f9fcc57085cf80197a2ef6db098f" }
+clippy_utils = { git = "https://github.com/rust-lang/rust-clippy", rev = "3c7e7dbc1583a0b06df5bd7623dd354a4debd23d" }
 dylint_linting = "2.0.9"
 if_chain = "1.0.2"
 

diff --git a/internal/template/rust-toolchain b/internal/template/rust-toolchain
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2022-06-30"
+channel = "nightly-2022-07-28"
 components = ["llvm-tools-preview", "rustc-dev"]