Fix merge issues

qAison · Dec 12, 2022 · 6032348 · 6032348
1 parent 20428fc
commit 6032348
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 43 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/lib/cli/Cargo.toml b/lib/cli/Cargo.toml
@@ -73,6 +73,16 @@ isatty = "0.1.9"
 dialoguer = "0.10.2"
 tldextract = "0.6.0"
 hex = "0.4.3"
+flate2 = "1.0.25"
+cargo_metadata = "0.15.2"
+rusqlite = { version = "0.28.0", features = ["bundled"] }
+tar = "0.4.38"
+thiserror = "1.0.37"
+time = "0.1.45"
+log = "0.4.17"
+minisign = "0.7.2"
+semver = "1.0.14"
+rpassword = "7.2.0"
 
 [build-dependencies]
 chrono = { version = "^0.4", default-features = false, features = [ "std", "clock" ] }

diff --git a/lib/cli/src/cli.rs b/lib/cli/src/cli.rs
@@ -11,7 +11,7 @@ use crate::commands::CreateObj;
 #[cfg(feature = "wast")]
 use crate::commands::Wast;
 use crate::commands::{
-    Add, Cache, Config, Inspect, List, Login, Run, SelfUpdate, Validate, Whoami,
+    Add, Cache, Config, Init, Inspect, List, Login, Publish, Run, SelfUpdate, Validate, Whoami,
 };
 use crate::error::PrettyError;
 use clap::{CommandFactory, ErrorKind, Parser};

diff --git a/lib/cli/src/commands.rs b/lib/cli/src/commands.rs
@@ -33,8 +33,8 @@ pub use create_obj::*;
 #[cfg(feature = "wast")]
 pub use wast::*;
 pub use {
-    add::*, cache::*, config::*, inspect::*, list::*, login::*, run::*, self_update::*,
-    validate::*, whoami::*,
+    add::*, cache::*, config::*, init::*, inspect::*, list::*, login::*, publish::*, run::*,
+    self_update::*, validate::*, whoami::*,
 };
 
 /// The kind of object format to emit.

diff --git a/lib/registry/Cargo.toml b/lib/registry/Cargo.toml
@@ -34,3 +34,5 @@ regex = "1.7.0"
 fs_extra = "1.2.0"
 filetime = "0.2.19"
 tldextract = "0.6.0"
+console = "0.15.2"
+indicatif = "0.17.2"
diff --git a/lib/registry/src/lib.rs b/lib/registry/src/lib.rs
@@ -22,7 +22,6 @@ pub mod config;
 pub mod graphql;
 pub mod login;
 pub mod package;
-pub mod queries;
 pub mod publish;
 pub mod queries;
 pub mod utils;