about summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-07-20 07:28:08 +0000
committerbors <bors@rust-lang.org>2023-07-20 07:28:08 +0000
commitd764a0ea5e2f9c4d182bea13c3ad269f1fbe384c (patch)
treed63e9ad616f21e1b20dfe10ab9aad6289a71f642 /tests
parentd71fbb9db23b33fa3b512ec0ef33afe1682b16de (diff)
parent1f82f6ddf30568af39b2f8bed6c723822b39aabe (diff)
downloadrust-d764a0ea5e2f9c4d182bea13c3ad269f1fbe384c.tar.gz
rust-d764a0ea5e2f9c4d182bea13c3ad269f1fbe384c.zip
Auto merge of #11161 - c410-f3r:let-chain, r=dswij
[significant_drop_tightening] Fix #11160

Fix #11160

```
changelog: [`significant_drop_tightening`]: Ignore literals in function returns
```
Diffstat (limited to 'tests')
-rw-r--r--tests/ui/significant_drop_tightening.fixed7
-rw-r--r--tests/ui/significant_drop_tightening.rs7
-rw-r--r--tests/ui/significant_drop_tightening.stderr6
3 files changed, 17 insertions, 3 deletions
diff --git a/tests/ui/significant_drop_tightening.fixed b/tests/ui/significant_drop_tightening.fixed
index eb8524167c4..aa6690b77e1 100644
--- a/tests/ui/significant_drop_tightening.fixed
+++ b/tests/ui/significant_drop_tightening.fixed
@@ -51,6 +51,13 @@ pub fn issue_11128() {
     }
 }
 
+pub fn issue_11160() -> bool {
+    let mutex = Mutex::new(1i32);
+    let lock = mutex.lock().unwrap();
+    let _ = lock.abs();
+    true
+}
+
 pub fn path_return_can_be_ignored() -> i32 {
     let mutex = Mutex::new(1);
     let lock = mutex.lock().unwrap();
diff --git a/tests/ui/significant_drop_tightening.rs b/tests/ui/significant_drop_tightening.rs
index f7fa65ea922..a0bf657df55 100644
--- a/tests/ui/significant_drop_tightening.rs
+++ b/tests/ui/significant_drop_tightening.rs
@@ -50,6 +50,13 @@ pub fn issue_11128() {
     }
 }
 
+pub fn issue_11160() -> bool {
+    let mutex = Mutex::new(1i32);
+    let lock = mutex.lock().unwrap();
+    let _ = lock.abs();
+    true
+}
+
 pub fn path_return_can_be_ignored() -> i32 {
     let mutex = Mutex::new(1);
     let lock = mutex.lock().unwrap();
diff --git a/tests/ui/significant_drop_tightening.stderr b/tests/ui/significant_drop_tightening.stderr
index ca4fede17c9..45ca73af3a8 100644
--- a/tests/ui/significant_drop_tightening.stderr
+++ b/tests/ui/significant_drop_tightening.stderr
@@ -23,7 +23,7 @@ LL +     drop(lock);
    |
 
 error: temporary with significant `Drop` can be early dropped
-  --> $DIR/significant_drop_tightening.rs:79:13
+  --> $DIR/significant_drop_tightening.rs:86:13
    |
 LL | /     {
 LL | |         let mutex = Mutex::new(1i32);
@@ -43,7 +43,7 @@ LL +         drop(lock);
    |
 
 error: temporary with significant `Drop` can be early dropped
-  --> $DIR/significant_drop_tightening.rs:100:13
+  --> $DIR/significant_drop_tightening.rs:107:13
    |
 LL | /     {
 LL | |         let mutex = Mutex::new(1i32);
@@ -67,7 +67,7 @@ LL +
    |
 
 error: temporary with significant `Drop` can be early dropped
-  --> $DIR/significant_drop_tightening.rs:106:17
+  --> $DIR/significant_drop_tightening.rs:113:17
    |
 LL | /     {
 LL | |         let mutex = Mutex::new(vec![1i32]);