Skip to content

Commit 37e5f13

Browse files
committed
Auto merge of #13964 - surechen:fix_for_lint_copy_drop, r=weihanglo
test: switch from `drop` to `let _` due to nightly rustc change Fix test error in rust-lang/rust#125533 As lint dropping_copy_types will give suggsetion in this situation.(Changed in rust-lang/rust#125433) r? `@weihanglo`
2 parents a8d72c6 + 1c8da38 commit 37e5f13

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

tests/testsuite/fix.rs

+12-12
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ fn do_not_fix_broken_builds() {
1616
r#"
1717
pub fn foo() {
1818
let mut x = 3;
19-
drop(x);
19+
let _ = x;
2020
}
2121
2222
pub fn foo2() {
@@ -427,7 +427,7 @@ fn fix_deny_warnings() {
427427
.file(
428428
"src/lib.rs",
429429
"#![deny(warnings)]
430-
pub fn foo() { let mut x = 3; drop(x); }
430+
pub fn foo() { let mut x = 3; let _ = x; }
431431
",
432432
)
433433
.build();
@@ -503,25 +503,25 @@ fn fix_two_files() {
503503
#[cargo_test]
504504
fn fixes_missing_ampersand() {
505505
let p = project()
506-
.file("src/main.rs", "fn main() { let mut x = 3; drop(x); }")
506+
.file("src/main.rs", "fn main() { let mut x = 3; let _ = x; }")
507507
.file(
508508
"src/lib.rs",
509509
r#"
510-
pub fn foo() { let mut x = 3; drop(x); }
510+
pub fn foo() { let mut x = 3; let _ = x; }
511511
512512
#[test]
513-
pub fn foo2() { let mut x = 3; drop(x); }
513+
pub fn foo2() { let mut x = 3; let _ = x; }
514514
"#,
515515
)
516516
.file(
517517
"tests/a.rs",
518518
r#"
519519
#[test]
520-
pub fn foo() { let mut x = 3; drop(x); }
520+
pub fn foo() { let mut x = 3; let _ = x; }
521521
"#,
522522
)
523-
.file("examples/foo.rs", "fn main() { let mut x = 3; drop(x); }")
524-
.file("build.rs", "fn main() { let mut x = 3; drop(x); }")
523+
.file("examples/foo.rs", "fn main() { let mut x = 3; let _ = x; }")
524+
.file("build.rs", "fn main() { let mut x = 3; let _ = x; }")
525525
.build();
526526

527527
p.cargo("fix --all-targets --allow-no-vcs")
@@ -701,8 +701,8 @@ fn does_not_warn_about_dirty_ignored_files() {
701701
#[cargo_test]
702702
fn fix_all_targets_by_default() {
703703
let p = project()
704-
.file("src/lib.rs", "pub fn foo() { let mut x = 3; drop(x); }")
705-
.file("tests/foo.rs", "pub fn foo() { let mut x = 3; drop(x); }")
704+
.file("src/lib.rs", "pub fn foo() { let mut x = 3; let _ = x; }")
705+
.file("tests/foo.rs", "pub fn foo() { let mut x = 3; let _ = x; }")
706706
.build();
707707
p.cargo("fix --allow-no-vcs")
708708
.env("__CARGO_FIX_YOLO", "1")
@@ -1280,7 +1280,7 @@ fn fix_to_broken_code() {
12801280
"#,
12811281
)
12821282
.file("bar/build.rs", "fn main() {}")
1283-
.file("bar/src/lib.rs", "pub fn foo() { let mut x = 3; drop(x); }")
1283+
.file("bar/src/lib.rs", "pub fn foo() { let mut x = 3; let _ = x; }")
12841284
.build();
12851285

12861286
// Build our rustc shim
@@ -1296,7 +1296,7 @@ fn fix_to_broken_code() {
12961296

12971297
assert_eq!(
12981298
p.read_file("bar/src/lib.rs"),
1299-
"pub fn foo() { let x = 3; drop(x); }"
1299+
"pub fn foo() { let x = 3; let _ = x; }"
13001300
);
13011301
}
13021302

0 commit comments

Comments
 (0)