Skip to content

Commit 34be0f5

Browse files
authored
Merge pull request #38 from rust-transit/switch_to_clap
Switch from docopt to clap
2 parents 648195a + a94b47f commit 34be0f5

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ license = "MIT"
1111
[dependencies]
1212
osmpbfreader = "0.16.1"
1313
csv = "1.3.0"
14-
docopt = "1.1.1"
14+
clap = { version = "4.4", features = ["derive"] }
1515
serde = "1.0"
1616

1717
[lib]

src/main.rs

+10-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1+
use clap::Parser;
2+
3+
#[derive(Parser)]
4+
#[command(author, version, about, long_about = None)]
5+
struct Cli {
6+
source_pbf: String,
7+
}
18
fn main() {
2-
const USAGE: &str = "
3-
Usage: osm4routing <source.osm.pbf>";
4-
let args = docopt::Docopt::new(USAGE)
5-
.unwrap()
6-
.parse()
7-
.unwrap_or_else(|e| e.exit());
8-
let filename = args.get_str("<source.osm.pbf>");
9-
match osm4routing::read(filename) {
9+
let cli = Cli::parse();
10+
11+
match osm4routing::read(&cli.source_pbf) {
1012
Ok((nodes, edges)) => osm4routing::writers::csv(nodes, edges),
1113
Err(error) => println!("Error: {}", error),
1214
}

0 commit comments

Comments
 (0)