From 66e3080173cdc996a6548004eb46a13ae35f0dca Mon Sep 17 00:00:00 2001 From: Jeong YunWon Date: Wed, 22 Feb 2023 16:52:40 +0900 Subject: [PATCH] Fix ModeParseError message --- core/src/mode.rs | 8 +++----- parser/src/mode.rs | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/core/src/mode.rs b/core/src/mode.rs index b56f226..ca0d599 100644 --- a/core/src/mode.rs +++ b/core/src/mode.rs @@ -15,18 +15,16 @@ impl std::str::FromStr for Mode { "exec" => Ok(Mode::Exec), "eval" => Ok(Mode::Eval), "single" => Ok(Mode::Single), - _ => Err(ModeParseError { _priv: () }), + _ => Err(ModeParseError(())), } } } #[derive(Debug)] -pub struct ModeParseError { - _priv: (), -} +pub struct ModeParseError(()); impl std::fmt::Display for ModeParseError { fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { - write!(f, r#"mode should be "exec", "eval", or "single""#) + write!(f, r#"mode must be "exec", "eval", or "single""#) } } diff --git a/parser/src/mode.rs b/parser/src/mode.rs index 4403fbe..9e9f1e1 100644 --- a/parser/src/mode.rs +++ b/parser/src/mode.rs @@ -39,19 +39,17 @@ impl std::str::FromStr for Mode { match s { "exec" | "single" => Ok(Mode::Module), "eval" => Ok(Mode::Expression), - _ => Err(ModeParseError { _priv: () }), + _ => Err(ModeParseError(())), } } } /// Returned when a given mode is not valid. #[derive(Debug)] -pub struct ModeParseError { - _priv: (), -} +pub struct ModeParseError(()); impl std::fmt::Display for ModeParseError { fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { - write!(f, r#"mode should be "exec", "eval", or "single""#) + write!(f, r#"mode must be "exec", "eval", or "single""#) } }