aya-log: Unify IP format hints into one, repsesent it by :i token
#599
+16
−29
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
✅ Deploy Preview for aya-rs-docs ready!Built without sensitive environment variables
To edit notification comments on pull requests, go to your Netlify site settings. |
|
I'm going to change other incorrect tokens (e.g. |
Having separate format hints and tokens per IP address family is unnecessary, since they are represented by different types and we handle format hints for each type separately. So we can just have one format hint. Also, we should be consistent with the format strings grammar in Rust[0]. The `type` token, which is mapped to formatting traits, usually consists of one letter[1] (and optional `?` for `Debug` trait, but that doesn't matter for us). It shouldn't consist of multiple letters. Our `:ipv4` and `:ipv6` tokens were clearly breaking that convention, so we should rather switch to something with one letter - hence `:i`. [0] https://doc.rust-lang.org/std/fmt/#syntax [1] https://doc.rust-lang.org/std/fmt/#formatting-traits
shaneutt
approved these changes
May 12, 2023
rbartlensky
added a commit
to rbartlensky/aya
that referenced
this pull request
May 27, 2023
aya-log-ebpf-macros was failing to compile because it was referencing a couple of `DisplayHint` variants that no longer exist. These were removed in aya-rs#599. ``` Compiling aya-log-ebpf-macros v0.1.0 (/home/robert/aya/aya-log-ebpf-macros) error[E0599]: no variant or associated item named `Ipv4` found for enum `DisplayHint` in the current scope --> aya-log-ebpf-macros/src/expand.rs:93:22 | 93 | DisplayHint::Ipv4 => parse_str("::aya_log_ebpf::macro_support::check_impl_ipv4"), | ^^^^ variant or associated item not found in `DisplayHint` error[E0599]: no variant or associated item named `Ipv6` found for enum `DisplayHint` in the current scope --> aya-log-ebpf-macros/src/expand.rs:94:22 | 94 | DisplayHint::Ipv6 => parse_str("::aya_log_ebpf::macro_support::check_impl_ipv6"), | ^^^^ variant or associated item not found in `DisplayHint` For more information about this error, try `rustc --explain E0599`. ```
rbartlensky
added a commit
to rbartlensky/aya
that referenced
this pull request
May 28, 2023
aya-log-ebpf-macros was failing to compile because it was referencing a couple of `DisplayHint` variants that no longer exist. These were removed in aya-rs#599. ``` Compiling aya-log-ebpf-macros v0.1.0 (/home/robert/aya/aya-log-ebpf-macros) error[E0599]: no variant or associated item named `Ipv4` found for enum `DisplayHint` in the current scope --> aya-log-ebpf-macros/src/expand.rs:93:22 | 93 | DisplayHint::Ipv4 => parse_str("::aya_log_ebpf::macro_support::check_impl_ipv4"), | ^^^^ variant or associated item not found in `DisplayHint` error[E0599]: no variant or associated item named `Ipv6` found for enum `DisplayHint` in the current scope --> aya-log-ebpf-macros/src/expand.rs:94:22 | 94 | DisplayHint::Ipv6 => parse_str("::aya_log_ebpf::macro_support::check_impl_ipv6"), | ^^^^ variant or associated item not found in `DisplayHint` For more information about this error, try `rustc --explain E0599`. ```
alessandrod
pushed a commit
that referenced
this pull request
May 28, 2023
aya-log-ebpf-macros was failing to compile because it was referencing a couple of `DisplayHint` variants that no longer exist. These were removed in #599. ``` Compiling aya-log-ebpf-macros v0.1.0 (/home/robert/aya/aya-log-ebpf-macros) error[E0599]: no variant or associated item named `Ipv4` found for enum `DisplayHint` in the current scope --> aya-log-ebpf-macros/src/expand.rs:93:22 | 93 | DisplayHint::Ipv4 => parse_str("::aya_log_ebpf::macro_support::check_impl_ipv4"), | ^^^^ variant or associated item not found in `DisplayHint` error[E0599]: no variant or associated item named `Ipv6` found for enum `DisplayHint` in the current scope --> aya-log-ebpf-macros/src/expand.rs:94:22 | 94 | DisplayHint::Ipv6 => parse_str("::aya_log_ebpf::macro_support::check_impl_ipv6"), | ^^^^ variant or associated item not found in `DisplayHint` For more information about this error, try `rustc --explain E0599`. ```
gingk1212
added a commit
to gingk1212/book
that referenced
this pull request
May 29, 2023
`{:ipv4}` has been replaced with `{:i}` in aya-rs/aya#599.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Having separate format hints and tokens per IP address family is unnecessary, since they are represented by different types and we handle format hints for each type separately. So we can just have one format hint.
Also, we should be consistent with the format strings grammar in Rust[0]. The
typetoken, which is mapped to formatting traits, usually consists of one letter[1] (and optional?forDebugtrait, but that doesn't matter for us). It shouldn't consist of multiple letters. Our:ipv4and:ipv6tokens were clearly breaking that convention, so we should rather switch to something with one letter - hence:i.[0] https://doc.rust-lang.org/std/fmt/#syntax
[1] https://doc.rust-lang.org/std/fmt/#formatting-traits