Use PyResult instead of standard Result.

progval · progval · commit 7deeb9aae63b · 2016-04-21T17:28:44.000+02:00
diff --git a/src/lib.rs b/src/lib.rs
@@ -38,7 +38,7 @@ pub fn run_file<R: io::Read, EP: sandbox::EnvProxy>(reader: &mut R, envproxy: EP
     let primitive_objects = objects::PrimitiveObjects::new(&mut store);
     let module = try!(marshal::read_object(reader, &mut store, &primitive_objects).map_err(InterpreterError::Unmarshal));
     let mut processor = Processor { envproxy: envproxy, store: store, primitive_functions: primitives::get_default_primitives(), primitive_objects: primitive_objects };
-    let result = try!(processor.run_code_object(module).map_err(InterpreterError::Processor));
+    let result = processor.run_code_object(module);
     Ok((processor, result))
 }
 
diff --git a/src/primitives/mod.rs b/src/primitives/mod.rs
@@ -31,7 +31,7 @@ macro_rules! parse_arguments {
     }};
 }
 
-fn write_stdout<EP: EnvProxy>(processor: &mut Processor<EP>, args: Vec<ObjectRef>) -> Result<PyResult, ProcessorError> {
+fn write_stdout<EP: EnvProxy>(processor: &mut Processor<EP>, args: Vec<ObjectRef>) -> PyResult {
     parse_arguments!("__primitives__.write_stdout", processor.store, args,
         "value" "a string, boolean, or integer": {
             ObjectContent::String(ref s) => {
@@ -48,10 +48,10 @@ fn write_stdout<EP: EnvProxy>(processor: &mut Processor<EP>, args: Vec<ObjectRef
             },
         }
     );
-    Ok(PyResult::Return(processor.primitive_objects.none.clone()))
+    PyResult::Return(processor.primitive_objects.none.clone())
 }
 
-fn build_class<EP: EnvProxy>(processor: &mut Processor<EP>, args: Vec<ObjectRef>) -> Result<PyResult, ProcessorError> {
+fn build_class<EP: EnvProxy>(processor: &mut Processor<EP>, args: Vec<ObjectRef>) -> PyResult {
     let name;
     let code;
     let mut args_iter = args.into_iter();
@@ -72,10 +72,10 @@ fn build_class<EP: EnvProxy>(processor: &mut Processor<EP>, args: Vec<ObjectRef>
     else {
         bases
     };
-    Ok(PyResult::Return(processor.store.allocate(Object::new_class(name, Some(code), processor.primitive_objects.type_.clone(), bases))))
+    PyResult::Return(processor.store.allocate(Object::new_class(name, Some(code), processor.primitive_objects.type_.clone(), bases)))
 }
 
-fn issubclass<EP: EnvProxy>(processor: &mut Processor<EP>, args: Vec<ObjectRef>) -> Result<PyResult, ProcessorError> {
+fn issubclass<EP: EnvProxy>(processor: &mut Processor<EP>, args: Vec<ObjectRef>) -> PyResult {
     if args.len() != 2 {
         panic!(format!("__primitives__.issubclass takes 2 arguments, not {}", args.len()))
     }
@@ -90,7 +90,7 @@ fn issubclass<EP: EnvProxy>(processor: &mut Processor<EP>, args: Vec<ObjectRef>)
             continue
         };
         if candidate.is(second) {
-            return Ok(PyResult::Return(processor.primitive_objects.true_obj.clone()))
+            return PyResult::Return(processor.primitive_objects.true_obj.clone())
         };
         match processor.store.deref(&candidate).bases {
             None => (),
@@ -101,10 +101,10 @@ fn issubclass<EP: EnvProxy>(processor: &mut Processor<EP>, args: Vec<ObjectRef>)
             }
         };
     }
-    Ok(PyResult::Return(processor.primitive_objects.false_obj.clone()))
+    PyResult::Return(processor.primitive_objects.false_obj.clone())
 }
 
-fn isinstance<EP: EnvProxy>(processor: &mut Processor<EP>, mut args: Vec<ObjectRef>) -> Result<PyResult, ProcessorError> {
+fn isinstance<EP: EnvProxy>(processor: &mut Processor<EP>, mut args: Vec<ObjectRef>) -> PyResult {
     if args.len() != 2 {
         panic!(format!("__primitives__.isinstance takes 2 arguments, not {}", args.len()))
     }
diff --git a/src/processor/mod.rs b/src/processor/mod.rs

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ pub fn run_file<R: io::Read, EP: sandbox::EnvProxy>(reader: &mut R, envproxy: EP`
`38`	`38`	`let primitive_objects = objects::PrimitiveObjects::new(&mut store);`
`39`	`39`	`let module = try!(marshal::read_object(reader, &mut store, &primitive_objects).map_err(InterpreterError::Unmarshal));`
`40`	`40`	`let mut processor = Processor { envproxy: envproxy, store: store, primitive_functions: primitives::get_default_primitives(), primitive_objects: primitive_objects };`
`41`		`- let result = try!(processor.run_code_object(module).map_err(InterpreterError::Processor));`
	`41`	`+ let result = processor.run_code_object(module);`
`42`	`42`	`Ok((processor, result))`
`43`	`43`	`}`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ macro_rules! parse_arguments {`
`31`	`31`	`}};`
`32`	`32`	`}`
`33`	`33`
`34`		`-fn write_stdout<EP: EnvProxy>(processor: &mut Processor<EP>, args: Vec<ObjectRef>) -> Result<PyResult, ProcessorError> {`
	`34`	`+fn write_stdout<EP: EnvProxy>(processor: &mut Processor<EP>, args: Vec<ObjectRef>) -> PyResult {`
`35`	`35`	`parse_arguments!("__primitives__.write_stdout", processor.store, args,`
`36`	`36`	`"value" "a string, boolean, or integer": {`
`37`	`37`	`ObjectContent::String(ref s) => {`
`@@ -48,10 +48,10 @@ fn write_stdout<EP: EnvProxy>(processor: &mut Processor<EP>, args: Vec<ObjectRef`
`48`	`48`	`},`
`49`	`49`	`}`
`50`	`50`	`);`
`51`		`- Ok(PyResult::Return(processor.primitive_objects.none.clone()))`
	`51`	`+ PyResult::Return(processor.primitive_objects.none.clone())`
`52`	`52`	`}`
`53`	`53`
`54`		`-fn build_class<EP: EnvProxy>(processor: &mut Processor<EP>, args: Vec<ObjectRef>) -> Result<PyResult, ProcessorError> {`
	`54`	`+fn build_class<EP: EnvProxy>(processor: &mut Processor<EP>, args: Vec<ObjectRef>) -> PyResult {`
`55`	`55`	`let name;`
`56`	`56`	`let code;`
`57`	`57`	`let mut args_iter = args.into_iter();`
`@@ -72,10 +72,10 @@ fn build_class<EP: EnvProxy>(processor: &mut Processor<EP>, args: Vec<ObjectRef>`
`72`	`72`	`else {`
`73`	`73`	`bases`
`74`	`74`	`};`
`75`		`- Ok(PyResult::Return(processor.store.allocate(Object::new_class(name, Some(code), processor.primitive_objects.type_.clone(), bases))))`
	`75`	`+ PyResult::Return(processor.store.allocate(Object::new_class(name, Some(code), processor.primitive_objects.type_.clone(), bases)))`
`76`	`76`	`}`
`77`	`77`
`78`		`-fn issubclass<EP: EnvProxy>(processor: &mut Processor<EP>, args: Vec<ObjectRef>) -> Result<PyResult, ProcessorError> {`
	`78`	`+fn issubclass<EP: EnvProxy>(processor: &mut Processor<EP>, args: Vec<ObjectRef>) -> PyResult {`
`79`	`79`	`if args.len() != 2 {`
`80`	`80`	`panic!(format!("__primitives__.issubclass takes 2 arguments, not {}", args.len()))`
`81`	`81`	`}`
`@@ -90,7 +90,7 @@ fn issubclass<EP: EnvProxy>(processor: &mut Processor<EP>, args: Vec<ObjectRef>)`
`90`	`90`	`continue`
`91`	`91`	`};`
`92`	`92`	`if candidate.is(second) {`
`93`		`- return Ok(PyResult::Return(processor.primitive_objects.true_obj.clone()))`
	`93`	`+ return PyResult::Return(processor.primitive_objects.true_obj.clone())`
`94`	`94`	`};`
`95`	`95`	`match processor.store.deref(&candidate).bases {`
`96`	`96`	`None => (),`
`@@ -101,10 +101,10 @@ fn issubclass<EP: EnvProxy>(processor: &mut Processor<EP>, args: Vec<ObjectRef>)`
`101`	`101`	`}`
`102`	`102`	`};`
`103`	`103`	`}`
`104`		`- Ok(PyResult::Return(processor.primitive_objects.false_obj.clone()))`
	`104`	`+ PyResult::Return(processor.primitive_objects.false_obj.clone())`
`105`	`105`	`}`
`106`	`106`
`107`		`-fn isinstance<EP: EnvProxy>(processor: &mut Processor<EP>, mut args: Vec<ObjectRef>) -> Result<PyResult, ProcessorError> {`
	`107`	`+fn isinstance<EP: EnvProxy>(processor: &mut Processor<EP>, mut args: Vec<ObjectRef>) -> PyResult {`
`108`	`108`	`if args.len() != 2 {`
`109`	`109`	`panic!(format!("__primitives__.isinstance takes 2 arguments, not {}", args.len()))`
`110`	`110`	`}`