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

Store full arm location in DropBomb

Browse Source 
Before, only the line was stored. This was enough for run-make tests, since these mostly only contain a single `rmake.rs` file, but not for bootstrap.
This commit is contained in:
Jakub Beránek 2024-07-04 15:56:16 +02:00 committed by Jakub Beránek
parent 49f54b8ee8
commit 042473fd13
No known key found for this signature in database
GPG Key ID: 909CD0D26483516B
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/tools/build_helper/src/drop_bomb/mod.rs
View File

@ -15,7 +15,7 @@ mod tests;
pub struct DropBomb { pub struct DropBomb {
command: OsString, command: OsString,
defused: bool, defused: bool,
armed_line: u32, armed_location: panic::Location<'static>,
} }
impl DropBomb { impl DropBomb {
@ -27,7 +27,7 @@ impl DropBomb {
DropBomb { DropBomb {
command: command.as_ref().into(), command: command.as_ref().into(),
defused: false, defused: false,
armed_line: panic::Location::caller().line(), armed_location: *panic::Location::caller(),
} }
} }
@ -41,8 +41,8 @@ impl Drop for DropBomb {
fn drop(&mut self) { fn drop(&mut self) {
if !self.defused && !std::thread::panicking() { if !self.defused && !std::thread::panicking() {
panic!( panic!(
"command constructed but not executed at line {}: `{}`", "command constructed but not executed at {}: `{}`",
self.armed_line, self.armed_location,
self.command.to_string_lossy() self.command.to_string_lossy()
) )
} }