Merge pull request RustPython#1285 from ChJR/feature/simplify-error-formatting/str.__mod__

coolreader18 · web-flow · commit 7a680c32a85f · 2019-08-16T02:39:59.000-05:00
Simplify error formatting of str.__mod__ method.
diff --git a/vm/src/obj/objstr.rs b/vm/src/obj/objstr.rs
@@ -514,7 +514,7 @@ impl PyString {
     fn modulo(&self, values: PyObjectRef, vm: &VirtualMachine) -> PyResult {
         let format_string_text = &self.value;
         let format_string = CFormatString::from_str(format_string_text)
-            .map_err(|err| vm.new_value_error(format!("{}", err)))?;
+            .map_err(|err| vm.new_value_error(err.to_string()))?;
         do_cformat(vm, format_string, values.clone())
     }
 

Original file line number	Diff line number	Diff line change
`@@ -514,7 +514,7 @@ impl PyString {`
`514`	`514`	`fn modulo(&self, values: PyObjectRef, vm: &VirtualMachine) -> PyResult {`
`515`	`515`	`let format_string_text = &self.value;`
`516`	`516`	`let format_string = CFormatString::from_str(format_string_text)`
`517`		`- .map_err(\|err\| vm.new_value_error(format!("{}", err)))?;`
	`517`	`+ .map_err(\|err\| vm.new_value_error(err.to_string()))?;`
`518`	`518`	`do_cformat(vm, format_string, values.clone())`
`519`	`519`	`}`
`520`	`520`