Auto merge of #3878 - ehiggs:revert-template-until-after-rfc, r=alexc…

…richton Revert template until after rfc As discussed in #3860, templates was merged without going through the RFC process. @ssokolow has raised some useful comments which need to be settled before the template system can be put back in. #3859 was another relevant issue.
rust-lang · Mar 31, 2017 · f53fec0 · f53fec0
2 parents 3191040 + b998130
commit f53fec0
Show file tree

Hide file tree

Showing 16 changed files with 281 additions and 974 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,6 +17,7 @@ name = "cargo"
 path = "src/cargo/lib.rs"
 
 [dependencies]
+chrono = "0.2.25"
 crates-io = { path = "src/crates-io", version = "0.8" }
 crossbeam = "0.2"
 curl = "0.4.6"
@@ -28,7 +29,6 @@ fs2 = "0.4"
 git2 = "0.6"
 git2-curl = "0.7"
 glob = "0.2"
-handlebars = { version = "0.25", features = ["serde_type", "partial4"], default-features = false }
 libc = "0.2"
 libgit2-sys = "0.6"
 log = "0.3"
@@ -43,7 +43,6 @@ shell-escape = "0.1"
 tar = { version = "0.4", default-features = false }
 tempdir = "0.3"
 term = "0.4.4"
-time = "0.1.36"
 toml = "0.3"
 url = "1.1"
 

diff --git a/src/bin/init.rs b/src/bin/init.rs
@@ -12,8 +12,6 @@ pub struct Options {
     flag_lib: bool,
     arg_path: Option<String>,
     flag_name: Option<String>,
-    flag_template_subdir: Option<String>,
-    flag_template: Option<String>,
     flag_vcs: Option<ops::VersionControl>,
     flag_frozen: bool,
     flag_locked: bool,
@@ -34,8 +32,6 @@ Options:
     --bin               Use a binary (application) template
     --lib               Use a library template
     --name NAME         Set the resulting package name
-    --template <repository>  Use a specified template repository
-    --template-subdir <template>  Use a specified template within a template repository
     -v, --verbose ...   Use verbose output (-vv very verbose/build.rs output)
     -q, --quiet         No output printed to stdout
     --color WHEN        Coloring: auto, always, never
@@ -51,22 +47,14 @@ pub fn execute(options: Options, config: &Config) -> CliResult {
                      options.flag_frozen,
                      options.flag_locked)?;
 
-    let Options { 
-        flag_bin, flag_lib, 
-        arg_path, flag_name, 
-        flag_vcs, 
-        flag_template_subdir, flag_template, 
-        .. 
-    } = options;
+    let Options { flag_bin, flag_lib, arg_path, flag_name, flag_vcs, .. } = options;
 
     let tmp = &arg_path.unwrap_or(format!("."));
     let opts = ops::NewOptions::new(flag_vcs,
                                      flag_bin,
                                      flag_lib,
                                      tmp,
-                                     flag_name.as_ref().map(|s| s.as_ref()),
-                                     flag_template_subdir.as_ref().map(|s| s.as_ref()),
-                                     flag_template.as_ref().map(|s| s.as_ref()));
+                                     flag_name.as_ref().map(|s| s.as_ref()));
 
     let opts_lib = opts.lib;
     ops::init(opts, config)?;

diff --git a/src/bin/new.rs b/src/bin/new.rs
@@ -12,8 +12,6 @@ pub struct Options {
     flag_lib: bool,
     arg_path: String,
     flag_name: Option<String>,
-    flag_template_subdir: Option<String>,
-    flag_template: Option<String>,
     flag_vcs: Option<ops::VersionControl>,
     flag_frozen: bool,
     flag_locked: bool,
@@ -34,8 +32,6 @@ Options:
     --bin               Use a binary (application) template
     --lib               Use a library template
     --name NAME         Set the resulting package name, defaults to the value of <path>
-    --template <repository>  Use a specified template repository
-    --template-subdir <template-subdir>  Use a specified template within a template repository
     -v, --verbose ...   Use verbose output (-vv very verbose/build.rs output)
     -q, --quiet         No output printed to stdout
     --color WHEN        Coloring: auto, always, never
@@ -51,21 +47,13 @@ pub fn execute(options: Options, config: &Config) -> CliResult {
                      options.flag_frozen,
                      options.flag_locked)?;
 
-    let Options { 
-        flag_bin, flag_lib, 
-        arg_path, flag_name, 
-        flag_vcs, 
-        flag_template_subdir, flag_template, 
-        .. 
-    } = options;
+    let Options { flag_bin, flag_lib, arg_path, flag_name, flag_vcs, .. } = options;
 
     let opts = ops::NewOptions::new(flag_vcs,
                                     flag_bin,
                                     flag_lib,
                                     &arg_path,
-                                    flag_name.as_ref().map(|s| s.as_ref()),
-                                    flag_template_subdir.as_ref().map(|s| s.as_ref()),
-                                    flag_template.as_ref().map(|s| s.as_ref()));
+                                    flag_name.as_ref().map(|s| s.as_ref()));
 
     let opts_lib = opts.lib;
     ops::new(opts, config)?;

diff --git a/src/cargo/lib.rs b/src/cargo/lib.rs
@@ -5,6 +5,7 @@
 #[macro_use] extern crate log;
 #[macro_use] extern crate serde_derive;
 #[macro_use] extern crate serde_json;
+extern crate chrono;
 extern crate crates_io as registry;
 extern crate crossbeam;
 extern crate curl;
@@ -14,7 +15,6 @@ extern crate flate2;
 extern crate fs2;
 extern crate git2;
 extern crate glob;
-extern crate handlebars;
 extern crate libc;
 extern crate libgit2_sys;
 extern crate num_cpus;
@@ -26,7 +26,6 @@ extern crate shell_escape;
 extern crate tar;
 extern crate tempdir;
 extern crate term;
-extern crate time;
 extern crate toml;
 extern crate url;