From 73366769148a8584c2c8b326c7c8d8d6f3fa3107 Mon Sep 17 00:00:00 2001 From: Aram Peres Date: Sun, 1 Aug 2021 17:22:36 -0400 Subject: [PATCH] Reduce some visiblity --- rups/src/cmd.rs | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/rups/src/cmd.rs b/rups/src/cmd.rs index d58fd29..c31a024 100644 --- a/rups/src/cmd.rs +++ b/rups/src/cmd.rs @@ -116,7 +116,7 @@ pub enum Response { } impl Response { - pub fn from_args(mut args: Vec) -> crate::Result { + pub(crate) fn from_args(mut args: Vec) -> crate::Result { if args.is_empty() { return Err(ClientError::generic( "Parsing server response failed: empty line", @@ -396,14 +396,14 @@ impl Response { } } - pub fn expect_ok(&self) -> crate::Result<&Response> { + pub(crate) fn expect_ok(&self) -> crate::Result<&Response> { match self { Self::Ok => Ok(self), _ => Err(NutError::UnexpectedResponse.into()), } } - pub fn expect_begin_list(self, expected_args: &[&str]) -> crate::Result { + pub(crate) fn expect_begin_list(self, expected_args: &[&str]) -> crate::Result { let expected_args = shell_words::join(expected_args); if let Self::BeginList(args) = &self { if &expected_args == args { @@ -416,7 +416,7 @@ impl Response { } } - pub fn expect_var(&self) -> crate::Result { + pub(crate) fn expect_var(&self) -> crate::Result { if let Self::Var(name, value) = &self { Ok(Variable::parse(name, value.to_owned())) } else { @@ -424,7 +424,7 @@ impl Response { } } - pub fn expect_rw(&self) -> crate::Result { + pub(crate) fn expect_rw(&self) -> crate::Result { if let Self::Rw(name, value) = &self { Ok(Variable::parse(name, value.to_owned())) } else { @@ -432,7 +432,7 @@ impl Response { } } - pub fn expect_ups(&self) -> crate::Result<(String, String)> { + pub(crate) fn expect_ups(&self) -> crate::Result<(String, String)> { if let Self::Ups(name, description) = &self { Ok((name.to_owned(), description.to_owned())) } else { @@ -440,7 +440,7 @@ impl Response { } } - pub fn expect_client(&self) -> crate::Result { + pub(crate) fn expect_client(&self) -> crate::Result { if let Self::Client(client_ip) = &self { Ok(client_ip.to_owned()) } else { @@ -448,7 +448,7 @@ impl Response { } } - pub fn expect_cmd(&self) -> crate::Result { + pub(crate) fn expect_cmd(&self) -> crate::Result { if let Self::Cmd(name) = &self { Ok(name.to_owned()) } else { @@ -456,7 +456,7 @@ impl Response { } } - pub fn expect_cmddesc(&self) -> crate::Result { + pub(crate) fn expect_cmddesc(&self) -> crate::Result { if let Self::CmdDesc(description) = &self { Ok(description.to_owned()) } else { @@ -464,7 +464,7 @@ impl Response { } } - pub fn expect_upsdesc(&self) -> crate::Result { + pub(crate) fn expect_upsdesc(&self) -> crate::Result { if let Self::UpsDesc(description) = &self { Ok(description.to_owned()) } else { @@ -472,7 +472,7 @@ impl Response { } } - pub fn expect_desc(&self) -> crate::Result { + pub(crate) fn expect_desc(&self) -> crate::Result { if let Self::Desc(description) = &self { Ok(description.to_owned()) } else { @@ -480,7 +480,7 @@ impl Response { } } - pub fn expect_numlogins(&self) -> crate::Result { + pub(crate) fn expect_numlogins(&self) -> crate::Result { if let Self::NumLogins(num) = &self { Ok(*num) } else { @@ -488,7 +488,7 @@ impl Response { } } - pub fn expect_type(&self) -> crate::Result { + pub(crate) fn expect_type(&self) -> crate::Result { if let Self::Type(name, types) = &self { VariableDefinition::try_from(( name.to_owned(), @@ -499,7 +499,7 @@ impl Response { } } - pub fn expect_range(&self) -> crate::Result { + pub(crate) fn expect_range(&self) -> crate::Result { if let Self::Range(range) = &self { Ok(range.to_owned()) } else { @@ -507,7 +507,7 @@ impl Response { } } - pub fn expect_enum(&self) -> crate::Result { + pub(crate) fn expect_enum(&self) -> crate::Result { if let Self::Enum(value) = &self { Ok(value.to_owned()) } else {