@@ -1130,21 +1130,24 @@ def unwrap_or(self, default):
11301130 def expect (self , error_msg = "" , error_code = 5 ): # 5 -> ResultErr.error_code("Expect")
11311131 if self ._success :
11321132 return self ._val
1133- self .raises (error_msg , error_code )
1133+ self .add_Err_msg ("Result.expect for Err variant" , error_code , add_traceback = True )
1134+ self .raises (False , error_msg )
11341135
11351136 def expect_Err (self , ok_msg = "" , error_code = 5 ): # 5 -> ResultErr.error_code("Expect")
11361137 if not self ._success :
11371138 return self ._val
1138- err = ResultErr (f"Result.expect_err contains { self } ." , self .error_code ("Expect" ), self ._g , add_traceback = True )
1139- err .append (ok_msg , error_code , add_traceback = False )
1140- raise err
1139+ self .add_Err_msg ("Result.expect_err for Ok variant" , error_code , add_traceback = True )
1140+ self .raises (False , ok_msg )
11411141
1142- def raises (self , error_msg = "" , error_code = 1 ):
1142+ def raises (self , add_traceback = False , error_msg = "" , error_code = 15 ): # 15: "not_Ok",
11431143 if self ._success :
11441144 return self
11451145 if error_msg != "" :
1146- self .add_Err_msg (error_msg , error_code , add_traceback = False )
1147- raise self ._val # raised exception do to error
1146+ self .add_Err_msg (error_msg , error_code , add_traceback = add_traceback )
1147+ else :
1148+ self .add_Err_msg ("Result.raises() on Err" , error_code , add_traceback = add_traceback )
1149+ #
1150+ raise self ._val # Result.Err variant raises an exception
11481151
11491152 def is_Ok_and (self , bool_ok_func , * args , ** kwargs ):
11501153 return self ._success and bool_ok_func (self ._val , * args , ** kwargs )
0 commit comments