diff options
| author | bors <bors@rust-lang.org> | 2020-12-31 03:17:50 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-12-31 03:17:50 +0000 |
| commit | 923e3d2400e9a56fed70d377db5e7728ed3e5192 (patch) | |
| tree | 03a3792a72795e74a5d3815c9431119ae5c0fbd6 | |
| parent | f0073a59cffebcf4f31e2bfa690a18f4f1dfd608 (diff) | |
| parent | 56ea926b1cae1869420e0bba1a67b4cbf6d0d653 (diff) | |
| download | rust-923e3d2400e9a56fed70d377db5e7728ed3e5192.tar.gz rust-923e3d2400e9a56fed70d377db5e7728ed3e5192.zip | |
Auto merge of #80500 - jyn514:track-caller, r=nagisa
Add `#[track_caller]` to `bug!` and `register_renamed` Before: ``` thread 'rustc' panicked at 'compiler/rustc_lint/src/context.rs:267:18: invalid lint renaming of broken_intra_doc_links to rustdoc::broken_intra_doc_links', compiler/rustc_middle/src/util/bug.rs:34:26 ``` After: ``` thread 'rustc' panicked at 'src/librustdoc/core.rs:455:24: invalid lint renaming of broken_intra_doc_links to rustdoc::broken_intra_doc_links', compiler/rustc_middle/src/util/bug.rs:35:26 ``` The reason I added it to `register_renamed` too is that any panic in that function will be the caller's fault.
| -rw-r--r-- | compiler/rustc_lint/src/context.rs | 1 | ||||
| -rw-r--r-- | compiler/rustc_middle/src/util/bug.rs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/compiler/rustc_lint/src/context.rs b/compiler/rustc_lint/src/context.rs index ea4f7daec43..c82fe50af87 100644 --- a/compiler/rustc_lint/src/context.rs +++ b/compiler/rustc_lint/src/context.rs @@ -261,6 +261,7 @@ impl LintStore { } } + #[track_caller] pub fn register_renamed(&mut self, old_name: &str, new_name: &str) { let target = match self.by_name.get(new_name) { Some(&Id(lint_id)) => lint_id, diff --git a/compiler/rustc_middle/src/util/bug.rs b/compiler/rustc_middle/src/util/bug.rs index 0903ef50898..e79adcdb545 100644 --- a/compiler/rustc_middle/src/util/bug.rs +++ b/compiler/rustc_middle/src/util/bug.rs @@ -21,6 +21,7 @@ pub fn span_bug_fmt<S: Into<MultiSpan>>(span: S, args: fmt::Arguments<'_>) -> ! opt_span_bug_fmt(Some(span), args, Location::caller()); } +#[track_caller] fn opt_span_bug_fmt<S: Into<MultiSpan>>( span: Option<S>, args: fmt::Arguments<'_>, |