about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorBryan Garza <1396101+bryangarza@users.noreply.github.com>2022-12-07 20:13:22 +0000
committerBryan Garza <1396101+bryangarza@users.noreply.github.com>2022-12-21 03:39:33 +0000
commit2d060034f0fd5f5780c7fd41046901b8e0cdf7e8 (patch)
tree7c28ab790c359723d2c401232c50c7f08de1031d /src
parente28a07a0a157b63dc11e9f590484d5332866623a (diff)
downloadrust-2d060034f0fd5f5780c7fd41046901b8e0cdf7e8.tar.gz
rust-2d060034f0fd5f5780c7fd41046901b8e0cdf7e8.zip
Update track_caller logic/lint after rebase
Diffstat (limited to 'src')
-rw-r--r--src/test/ui/async-await/track-caller/panic-track-caller.nofeat.stderr12
-rw-r--r--src/test/ui/async-await/track-caller/panic-track-caller.rs7
2 files changed, 12 insertions, 7 deletions
diff --git a/src/test/ui/async-await/track-caller/panic-track-caller.nofeat.stderr b/src/test/ui/async-await/track-caller/panic-track-caller.nofeat.stderr
index 71d4b00cc6e..f313658c446 100644
--- a/src/test/ui/async-await/track-caller/panic-track-caller.nofeat.stderr
+++ b/src/test/ui/async-await/track-caller/panic-track-caller.nofeat.stderr
@@ -10,5 +10,15 @@ LL | | }
    |
    = note: `#[warn(ungated_async_fn_track_caller)]` on by default
 
-warning: 1 warning emitted
+warning: `#[track_caller]` on async functions is a no-op
+  --> $DIR/panic-track-caller.rs:62:5
+   |
+LL |       #[track_caller]
+   |       ^^^^^^^^^^^^^^^ help: enable this unstable feature: `closure_track_caller`
+LL | /     async fn bar_assoc() {
+LL | |         panic!();
+LL | |     }
+   | |_____- this function will not propagate the caller location
+
+warning: 2 warnings emitted
 
diff --git a/src/test/ui/async-await/track-caller/panic-track-caller.rs b/src/test/ui/async-await/track-caller/panic-track-caller.rs
index ee37e64be4f..02077db7c62 100644
--- a/src/test/ui/async-await/track-caller/panic-track-caller.rs
+++ b/src/test/ui/async-await/track-caller/panic-track-caller.rs
@@ -59,7 +59,7 @@ async fn foo_track_caller() {
 struct Foo;
 
 impl Foo {
-    #[track_caller]
+    #[track_caller] //[nofeat]~ WARN `#[track_caller]` on async functions is a no-op
     async fn bar_assoc() {
         panic!();
     }
@@ -104,9 +104,4 @@ fn main() {
     assert_eq!(panicked_at(|| block_on(foo_assoc())), 69);
     #[cfg(nofeat)]
     assert_eq!(panicked_at(|| block_on(foo_assoc())), 64);
-
-    #[cfg(feat)]
-    assert_eq!(panicked_at(|| block_on(foo_closure())), 76);
-    #[cfg(feat)]
-    assert_eq!(panicked_at(|| block_on(foo_closure())), 74);
 }