From 1e8fc5d269985048d8d3023a615b94a8908571cf Mon Sep 17 00:00:00 2001 From: sigoden Date: Sat, 11 May 2024 09:23:59 +0800 Subject: refactor: list roles includeing builtin roles (#499) --- src/config/input.rs | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'src/config/input.rs') diff --git a/src/config/input.rs b/src/config/input.rs index b7b896c..0527b49 100644 --- a/src/config/input.rs +++ b/src/config/input.rs @@ -106,7 +106,7 @@ impl Input { } pub fn session<'a>(&self, session: &'a Option) -> Option<&'a Session> { - if self.context.in_session { + if self.context.session { session.as_ref() } else { None @@ -114,7 +114,7 @@ impl Input { } pub fn session_mut<'a>(&self, session: &'a mut Option) -> Option<&'a mut Session> { - if self.context.in_session { + if self.context.session { session.as_mut() } else { None @@ -199,12 +199,19 @@ impl Input { #[derive(Debug, Clone, Default)] pub struct InputContext { role: Option, - in_session: bool, + session: bool, } impl InputContext { - pub fn new(role: Option, in_session: bool) -> Self { - Self { role, in_session } + pub fn new(role: Option, session: bool) -> Self { + Self { role, session } + } + + pub fn role(role: Role) -> Self { + Self { + role: Some(role), + session: false, + } } } -- cgit v1.2.3