Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rune: Do not trace return value (causes panic on Result:Err) #748

Merged
merged 2 commits into from
Jul 17, 2024
Merged

rune: Do not trace return value (causes panic on Result:Err) #748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26cce04
rune: Do not trace return value (causes panic on Result:Err)
VorpalBlade Jul 17, 2024
aa360a9
rune: Never error in Value debug formatting
VorpalBlade Jul 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion crates/rune/src/runtime/value.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2137,7 +2137,15 @@ impl fmt::Debug for Value {
let mut o = Formatter::new();

if self.string_debug(&mut o).is_err() {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might be useful to include this error as well?

return Err(fmt::Error);
match self.type_info() {
Ok(type_info) => {
write!(f, "<{} object at {:p}>", type_info, self)?;
}
Err(e) => {
write!(f, "<unknown object at {:p}: {}>", self, e)?;
}
}
return Ok(());
}

f.write_str(o.as_str())?;
Expand Down
2 changes: 1 addition & 1 deletion crates/rune/src/runtime/vm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2239,7 +2239,7 @@ impl Vm {
}

#[inline]
#[tracing::instrument(skip(self))]
#[tracing::instrument(skip(self, return_value))]
fn op_return_internal(&mut self, return_value: Value) -> VmResult<Option<Output>> {
let (exit, out) = vm_try!(self.pop_call_frame());

Expand Down