sidecar: migrate from clap 2 to clap 4 #83
Merged
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
Use "derive" features of clap 4 to declare and parse addr2line command line arguments. Link: https://docs.rs/clap/latest/clap/_derive/_tutorial/index.html Link: https://simoncw.com/posts/learning-rust-from-clap2-2-clap4/ Signed-off-by: Ihor Solodrai <ihor.solodrai@pm.me>
d-e-s-o
reviewed
Oct 7, 2024
sidecar/src/main.rs
Outdated
|
|
||
| #[arg(short = 'C', long = "demangle", | ||
| help = "Demangle function names. \ | ||
| Specifying a specific demangling style (like GNU addr2line)is not supported.")] |
There was a problem hiding this comment.
Suggested change
| Specifying a specific demangling style (like GNU addr2line)is not supported.")] | |
| Specifying a specific demangling style (like GNU addr2line) is not supported.")] |
sidecar/src/main.rs
Outdated
| } | ||
| } | ||
| #[arg(short = 'p', long = "pretty-print", | ||
| help = "Make the output more human friendly: each location are printed on one line.")] |
There was a problem hiding this comment.
Suggested change
| help = "Make the output more human friendly: each location are printed on one line.")] | |
| help = "Make the output more human friendly: each location is printed on one line.")] |
sidecar/src/main.rs
Outdated
| } | ||
| #[arg(short = 'p', long = "pretty-print", | ||
| help = "Make the output more human friendly: each location are printed on one line.")] | ||
| pretty: bool, |
sidecar/src/main.rs
Outdated
| @@ -38,7 +38,7 @@ fn parse_query_line(string: &str) -> QueryType { | |||
| } | |||
|
|
|||
| enum Addrs<'a> { | |||
| Args(Values<'a>), | |||
| Args(std::vec::IntoIter<String>), | |||
There was a problem hiding this comment.
This replacement doesn't seem particularly elegant to me. Now you are forced to take from config below, which is error prone, because subsequent code may expect the addresses to be still available. In my opinion the following would be better:
--- src/main.rs
+++ src/main.rs
@@ -38,7 +38,7 @@ fn parse_query_line(string: &str) -> QueryType {
}
enum Addrs<'a> {
- Args(std::vec::IntoIter<String>),
+ Args(&'a mut dyn Iterator<Item = &'a str>),
Stdin(Lines<StdinLock<'a>>),
}
@@ -432,11 +430,13 @@ fn main() {
let dwarf = Arc::new(dwarf);
let ctx = Context::from_arc_dwarf(Arc::clone(&dwarf)).unwrap();
+ let mut addrs;
let stdin = std::io::stdin();
let queries = if config.addrs.is_empty() {
Addrs::Stdin(stdin.lock().lines())
} else {
- Addrs::Args(take(&mut config.addrs).into_iter())
+ addrs = config.addrs.iter().map(String::as_ref);
+ Addrs::Args(&mut addrs)
};
for addr_or_cunit in queries {
sidecar/src/main.rs
Outdated
|
|
||
| let config = Config::load(&matches); | ||
| let path = matches.value_of("exe").unwrap(); | ||
| let path = take(&mut config.exe); |
There was a problem hiding this comment.
This seems unnecessary. Just pass &config.exe to File::open?
Signed-off-by: Ihor Solodrai <ihor.solodrai@pm.me>
|
@d-e-s-o Thank you for review. I am a newbie at Rust, so your suggestions are greatly appreciated, thanks! |
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.
Use "derive" features of clap 4 to declare and parse addr2line command line arguments.
Resolves: #77
Link: https://docs.rs/clap/latest/clap/_derive/_tutorial/index.html
Link: https://simoncw.com/posts/learning-rust-from-clap2-2-clap4/