clap can now generate completions to a string; no need for codegen

diesel-rs · Aug 2, 2016 · cccbd91 · cccbd91
1 parent 16cf8cd
commit cccbd91
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 23 deletions.
diff --git a/diesel_cli/Cargo.toml b/diesel_cli/Cargo.toml
@@ -8,24 +8,20 @@ documentation = "http://diesel.rs/guides/getting-started"
 homepage = "http://diesel.rs"
 repository = "https://github.com/diesel-rs/diesel"
 keywords = ["orm", "database", "postgres", "postgresql", "sql"]
-build = "build.rs"
 
 [[bin]]
 name = "diesel"
 
 [dependencies]
 chrono = "0.2.17"
-clap = "2.9"
+clap = "2.10"
 diesel = { version = "0.7.0", default-features = false }
 dotenv = "0.8.0"
 
 [dev-dependencies]
 tempdir = "0.3.4"
 regex = "0.1.48"
 
-[build-dependencies]
-clap = "2.9"
-
 [features]
 default = ["postgres", "sqlite"]
 postgres = ["diesel/postgres"]

diff --git a/diesel_cli/build.rs b/diesel_cli/build.rs
diff --git a/diesel_cli/src/completion_script.rs b/diesel_cli/src/completion_script.rs
diff --git a/diesel_cli/src/main.rs b/diesel_cli/src/main.rs
@@ -7,10 +7,9 @@ mod database_error;
 #[macro_use]
 mod database;
 mod cli;
-mod completion_script;
 
 use chrono::*;
-use clap::ArgMatches;
+use clap::{ArgMatches,Shell};
 #[cfg(feature = "postgres")]
 use diesel::pg::PgConnection;
 #[cfg(feature = "sqlite")]
@@ -116,7 +115,7 @@ fn run_database_command(matches: &ArgMatches) {
 }
 
 fn generate_bash_completion_command(_: &ArgMatches) {
- print!("{}", completion_script::BASH_COMPLETION_SCRIPT);
+ cli::build_cli().gen_completions_to("diesel", Shell::Bash, &mut stdout());
 }
 
 /// Looks for a migrations directory in the current path and all parent paths,