mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #80500 - jyn514:track-caller, r=nagisa

Browse Source 
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.
This commit is contained in:
bors 2020-12-31 03:17:50 +00:00
commit 923e3d2400
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
compiler/rustc_lint/src/context.rs
View File

@ -261,6 +261,7 @@ impl LintStore {
} }
} }
#[track_caller]
pub fn register_renamed(&mut self, old_name: &str, new_name: &str) { pub fn register_renamed(&mut self, old_name: &str, new_name: &str) {
let target = match self.by_name.get(new_name) { let target = match self.by_name.get(new_name) {
Some(&Id(lint_id)) => lint_id, Some(&Id(lint_id)) => lint_id,

1
compiler/rustc_middle/src/util/bug.rs
View File

@ -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()); opt_span_bug_fmt(Some(span), args, Location::caller());
} }
#[track_caller]
fn opt_span_bug_fmt<S: Into<MultiSpan>>( fn opt_span_bug_fmt<S: Into<MultiSpan>>(
span: Option<S>, span: Option<S>,
args: fmt::Arguments<'_>, args: fmt::Arguments<'_>,