From 7d4a8baf7660c188a28c94a7a4d5b7975a0955ca Mon Sep 17 00:00:00 2001 From: Yoshua Wuyts Date: Wed, 28 Mar 2018 17:37:55 +0200 Subject: [PATCH 1/5] add target/ to gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 640216e..72bc027 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ - +target/ **/target **/*.rs.bk **/pkg From 75b0480daacb77d13c02c00b2af5a4a601b2938b Mon Sep 17 00:00:00 2001 From: Yoshua Wuyts Date: Wed, 28 Mar 2018 17:38:12 +0200 Subject: [PATCH 2/5] rustfmt reorder --- src/manifest.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/manifest.rs b/src/manifest.rs index da5308d..05936c1 100644 --- a/src/manifest.rs +++ b/src/manifest.rs @@ -2,11 +2,11 @@ use std::fs::File; use std::io::prelude::*; use console::style; +use emoji; use failure::Error; +use progressbar; use serde_json; use toml; -use emoji; -use progressbar; #[derive(Deserialize)] struct CargoManifest { From e886277031fa94401cf9812ee87099c218421902 Mon Sep 17 00:00:00 2001 From: Yoshua Wuyts Date: Wed, 28 Mar 2018 17:38:31 +0200 Subject: [PATCH 3/5] pick up collaborators from npm --- src/manifest.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/manifest.rs b/src/manifest.rs index 05936c1..063361c 100644 --- a/src/manifest.rs +++ b/src/manifest.rs @@ -16,6 +16,7 @@ struct CargoManifest { #[derive(Deserialize)] struct CargoPackage { name: String, + authors: Vec, description: String, version: String, license: String, @@ -25,6 +26,7 @@ struct CargoPackage { #[derive(Serialize)] struct NpmPackage { name: String, + collaborators: Vec, description: String, version: String, license: String, @@ -58,6 +60,7 @@ impl CargoManifest { } NpmPackage { name: self.package.name, + collaborators: self.package.authors, description: self.package.description, version: self.package.version, license: self.package.license, From d6671f33071b3f6001a711d281bd42232de88039 Mon Sep 17 00:00:00 2001 From: Yoshua Wuyts Date: Wed, 28 Mar 2018 17:38:39 +0200 Subject: [PATCH 4/5] pretty-print package.json --- src/manifest.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/manifest.rs b/src/manifest.rs index 063361c..e86e316 100644 --- a/src/manifest.rs +++ b/src/manifest.rs @@ -85,7 +85,7 @@ pub fn write_package_json(path: &str, scope: Option) -> Result<(), Error let mut pkg_file = File::create(pkg_file_path)?; let crate_data = read_cargo_toml(path)?; let npm_data = crate_data.into_npm(scope); - let npm_json = serde_json::to_string(&npm_data)?; + let npm_json = serde_json::to_string_pretty(&npm_data)?; pkg_file.write_all(npm_json.as_bytes())?; pb.finish(); Ok(()) From 4243f75b567eaeef579a8623bfc394458b9c9fe7 Mon Sep 17 00:00:00 2001 From: Ashley Williams Date: Wed, 28 Mar 2018 18:25:48 +0200 Subject: [PATCH 5/5] feat(style): appease cargo fmt --- src/bindgen.rs | 2 +- src/build.rs | 2 +- src/lib.rs | 8 ++++---- src/readme.rs | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/bindgen.rs b/src/bindgen.rs index c41f4ee..3def230 100644 --- a/src/bindgen.rs +++ b/src/bindgen.rs @@ -1,7 +1,7 @@ -use std::process::Command; use console::style; use emoji; use progressbar; +use std::process::Command; pub fn cargo_install_wasm_bindgen() { let step = format!( diff --git a/src/build.rs b/src/build.rs index 527a8c7..f3ed8a5 100644 --- a/src/build.rs +++ b/src/build.rs @@ -1,7 +1,7 @@ -use std::process::Command; use console::style; use emoji; use progressbar; +use std::process::Command; pub fn rustup_add_wasm_target() { let step = format!( diff --git a/src/lib.rs b/src/lib.rs index 05b78ba..748b4d3 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -6,17 +6,17 @@ extern crate serde_derive; extern crate serde_json; extern crate toml; -pub mod build; pub mod bindgen; -pub mod readme; +pub mod build; +pub mod emoji; pub mod manifest; pub mod progressbar; -pub mod emoji; +pub mod readme; use std::fs; -use failure::Error; use console::style; +use failure::Error; pub fn create_pkg_dir(path: &str) -> Result<(), Error> { let step = format!( diff --git a/src/readme.rs b/src/readme.rs index 20f5c45..6bde0dd 100644 --- a/src/readme.rs +++ b/src/readme.rs @@ -1,10 +1,10 @@ -use std::fs; -use failure::Error; use console::style; +use failure::Error; use indicatif::MultiProgress; +use std::fs; -use progressbar; use emoji; +use progressbar; pub fn copy_from_crate(path: &str) -> Result<(), Error> { let m = MultiProgress::new();