diff options
| author | Joshua Nelson <jyn514@gmail.com> | 2020-12-29 23:16:40 -0500 |
|---|---|---|
| committer | Joshua Nelson <jyn514@gmail.com> | 2020-12-29 23:18:11 -0500 |
| commit | 56ea926b1cae1869420e0bba1a67b4cbf6d0d653 (patch) | |
| tree | 507230581aa22194578b49e7b30f0746c8a70237 | |
| parent | dc6121ca681e3aef09b93afb13637632dcdc0e9a (diff) | |
| download | rust-56ea926b1cae1869420e0bba1a67b4cbf6d0d653.tar.gz rust-56ea926b1cae1869420e0bba1a67b4cbf6d0d653.zip | |
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 bfeef490489..9d9923b7d0e 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<'_>, |