Skip to content

Fix std::fmt::Display for abort expressions #830

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

Draft
wants to merge 10 commits into
base: main
Choose a base branch
from
Draft

Fix std::fmt::Display for abort expressions #830

Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d02ee1e
Fixed std::fmt::Display for abort expressions
DylanRJohnston May 7, 2024
45428f0
Fix std::fmt::Display for Query
DylanRJohnston May 7, 2024
220ef89
Fix std::fmt::Display for Infailable function calls
DylanRJohnston May 7, 2024
9206835
Fix float formatting
DylanRJohnston May 21, 2024
8aa7d85
Support nested indentation
DylanRJohnston May 31, 2024
12356c6
Fix indentation of inline blocks
DylanRJohnston Jun 19, 2024
c8e0fb5
Fix formatting of array indexing
DylanRJohnston Jun 20, 2024
89f8ccf
Fix identation within unary negation
DylanRJohnston Jul 3, 2024
b4a194b
Re-escape string literals
DylanRJohnston Jul 4, 2024
81eff6e
Merge branch 'vectordotdev:main' into main
DylanRJohnston Dec 3, 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
9 changes: 6 additions & 3 deletions src/parser/ast.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -933,7 +933,7 @@ pub struct Query {

impl fmt::Display for Query {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(f, "{}{}", self.target, self.path)
write!(f, "{}.{}", self.target, self.path)
Copy link
Author

@DylanRJohnston DylanRJohnston May 7, 2024

Choose a reason for hiding this comment

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

Without this variable queries end up mushed together e.g. foo.bar becomes foobar however that then causes .foo.bar to become ..foo.bar without the change to QueryTarget below.

}
}

Expand All @@ -958,7 +958,7 @@ impl fmt::Display for QueryTarget {
match self {
Internal(v) => v.fmt(f),
External(prefix) => match prefix {
PathPrefix::Event => write!(f, "."),
PathPrefix::Event => write!(f, ""),
Copy link
Author

@DylanRJohnston DylanRJohnston May 7, 2024

Choose a reason for hiding this comment

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

Should probably just remove this write! all together? If I understand correctly, and based on my testing QueryTarget always appears with a . after it even if OwnedValuePath is empty. So this is safe.

PathPrefix::Metadata => write!(f, "&"),
},
FunctionCall(v) => v.fmt(f),
Expand Down Expand Up @@ -1002,6 +1002,9 @@ pub struct FunctionCall {
impl fmt::Display for FunctionCall {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
self.ident.fmt(f)?;
if self.abort_on_error {
f.write_str("!")?;
}
f.write_str("(")?;

let mut iter = self.arguments.iter().peekable();
Expand Down Expand Up @@ -1196,7 +1199,7 @@ impl fmt::Display for Abort {
&self
.message
.as_ref()
.map_or_else(|| "abort".to_owned(), |m| format!("abort: {m}")),
.map_or_else(|| "abort".to_owned(), |m| format!("abort {m}")),
)
}
}
Expand Down