Update from master, fix merge conflicts

wasmerio · Nov 17, 2022 · 33a2585 · 33a2585
1 parent 3bb8ffd
commit 33a2585
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/lib/cli/src/cli.rs b/lib/cli/src/cli.rs
@@ -10,7 +10,7 @@ use crate::commands::CreateExe;
 use crate::commands::CreateObj;
 #[cfg(feature = "wast")]
 use crate::commands::Wast;
-use crate::commands::{Cache, Config, Inspect, List, Login, Run, SelfUpdate, Validate};
+use crate::commands::{Cache, Config, Inspect, List, Login, Run, SelfUpdate, Validate, Whoami};
 use crate::error::PrettyError;
 use clap::{CommandFactory, ErrorKind, Parser};
 use std::fmt;

diff --git a/lib/cli/src/commands.rs b/lib/cli/src/commands.rs
@@ -29,7 +29,7 @@ pub use create_exe::*;
 pub use create_obj::*;
 #[cfg(feature = "wast")]
 pub use wast::*;
-pub use {cache::*, config::*, inspect::*, list::*, login::*, run::*, self_update::*, validate::*};
+pub use {cache::*, config::*, inspect::*, list::*, login::*, run::*, self_update::*, validate::*, whoami::*};
 
 /// The kind of object format to emit.
 #[derive(Debug, Copy, Clone, clap::Parser)]

diff --git a/lib/registry/src/graphql.rs b/lib/registry/src/graphql.rs
@@ -84,6 +84,14 @@ mod proxy {
 )]
 pub(crate) struct GetPackageVersionQuery;
 
+#[derive(GraphQLQuery)]
+#[graphql(
+    schema_path = "graphql/schema.graphql",
+    query_path = "graphql/queries/whoami.graphql",
+    response_derives = "Debug"
+)]
+pub(crate) struct WhoAmIQuery;
+
 #[derive(GraphQLQuery)]
 #[graphql(
     schema_path = "graphql/schema.graphql",