修正

sotanengel · Jan 3, 2025 · 5240058 · 5240058
1 parent 334722e
commit 5240058
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/exercises/4_types_Prefer_idiomatic_error_types/1_my_error_string.rs b/exercises/4_types_Prefer_idiomatic_error_types/1_my_error_string.rs
@@ -3,7 +3,7 @@ fn do_something(flag: bool) -> Result<(), String> {
     if flag {
         Ok(())
     } else {
-        String::from("Something went wrong")
+        "Something went wrong".to_string()
     }
 }
 

diff --git a/exercises/4_types_Prefer_idiomatic_error_types/2_nest_error.rs b/exercises/4_types_Prefer_idiomatic_error_types/2_nest_error.rs
@@ -26,7 +26,7 @@ impl error::Error for AppError {
     fn source(&self) -> Option<&(dyn error::Error + 'static)> {}
 }
 
-// 便利な変換を追加
+// From<String> を実装して String からの変換を簡単に
 impl From<io::Error> for AppError {
     fn from(err: io::Error) -> Self {
         AppError::NotFound(err)
@@ -53,7 +53,7 @@ fn do_something(input: &str) -> Result<(), AppError> {
             "Input cannot be empty",
         ))?
     } else if input == "404" {
-        Err::<(), AppError>(String::from("Requested resource not found").into())?
+        Err(AppError::from("Requested resource not found".to_string()))?
     } else if input == "500" {
         Err(io::Error::new(
             io::ErrorKind::Other,

diff --git a/solutions/4_types_Prefer_idiomatic_error_types/1_my_error_string.rs b/solutions/4_types_Prefer_idiomatic_error_types/1_my_error_string.rs
@@ -33,7 +33,7 @@ fn do_something(flag: bool) -> Result<(), OriginalError> {
     if flag {
         Ok(())
     } else {
-        Err(OriginalError(String::from("Something went wrong")))
+        Err(OriginalError::from("Something went wrong"))
     }
 }
 

diff --git a/solutions/4_types_Prefer_idiomatic_error_types/2_nest_error.rs b/solutions/4_types_Prefer_idiomatic_error_types/2_nest_error.rs
@@ -32,7 +32,7 @@ impl error::Error for AppError {
     }
 }
 
-// 便利な変換を追加
+// From<String> を実装して String からの変換を簡単に
 impl From<io::Error> for AppError {
     fn from(err: io::Error) -> Self {
         AppError::NotFound(err)
@@ -59,7 +59,7 @@ fn do_something(input: &str) -> Result<(), AppError> {
             "Input cannot be empty",
         ))?
     } else if input == "404" {
-        Err::<(), AppError>(String::from("Requested resource not found").into())?
+        Err(AppError::from("Requested resource not found".to_string()))?
     } else if input == "500" {
         Err(io::Error::new(
             io::ErrorKind::Other,