Fix CI Build in Rust 1.38.0

j30ng · j30ng · commit b056044b5a75 · 2019-09-28T03:24:47.000+09:00
diff --git a/vm/src/obj/objstr.rs b/vm/src/obj/objstr.rs
@@ -1326,9 +1326,7 @@ fn try_update_quantity_from_tuple(
                         Ok(tuple_index)
                     }
                 }
-                None => {
-                    Err(vm.new_type_error("not enough arguments for format string".to_string()))
-                }
+                None => Err(vm.new_type_error("not enough arguments for format string".to_string())),
             }
         }
         _ => Ok(tuple_index),
diff --git a/vm/src/stdlib/ast.rs b/vm/src/stdlib/ast.rs
@@ -620,12 +620,8 @@ fn comprehension_to_ast(
 
 fn string_to_ast(vm: &VirtualMachine, string: &ast::StringGroup) -> PyResult<AstNodeRef> {
     let string = match string {
-        ast::StringGroup::Constant { value } => {
-            node!(vm, Str, { s => vm.ctx.new_str(value.clone()) })
-        }
-        ast::StringGroup::FormattedValue { value, .. } => {
-            node!(vm, FormattedValue, { value => expression_to_ast(vm, value)? })
-        }
+        ast::StringGroup::Constant { value } => node!(vm, Str, { s => vm.ctx.new_str(value.clone()) }),
+        ast::StringGroup::FormattedValue { value, .. } => node!(vm, FormattedValue, { value => expression_to_ast(vm, value)? }),
         ast::StringGroup::Joined { values } => {
             let py_values = map_ast(string_to_ast, vm, &values)?;
             node!(vm, JoinedStr, { values => py_values })
diff --git a/vm/src/stdlib/unicodedata.rs b/vm/src/stdlib/unicodedata.rs
@@ -54,9 +54,7 @@ fn name(
     } else {
         match default {
             OptionalArg::Present(obj) => Ok(obj),
-            OptionalArg::Missing => {
-                Err(vm.new_value_error("character name not found!".to_string()))
-            }
+            OptionalArg::Missing => Err(vm.new_value_error("character name not found!".to_string())),
         }
     }
 }
diff --git a/wasm/lib/src/browser_module.rs b/wasm/lib/src/browser_module.rs
@@ -137,7 +137,7 @@ fn browser_request_animation_frame(func: PyCallable, vm: &VirtualMachine) -> PyR
 
         let closure = f.borrow_mut().take();
         drop(closure);
-    }) as Box<Fn(f64)>));
+    }) as Box<dyn Fn(f64)>));
 
     let id = window()
         .request_animation_frame(&js_sys::Function::from(

Original file line number	Diff line number	Diff line change
`@@ -1326,9 +1326,7 @@ fn try_update_quantity_from_tuple(`
`1326`	`1326`	`Ok(tuple_index)`
`1327`	`1327`	`}`
`1328`	`1328`	`}`
`1329`		`- None => {`
`1330`		`- Err(vm.new_type_error("not enough arguments for format string".to_string()))`
`1331`		`- }`
	`1329`	`+ None => Err(vm.new_type_error("not enough arguments for format string".to_string())),`
`1332`	`1330`	`}`
`1333`	`1331`	`}`
`1334`	`1332`	`_ => Ok(tuple_index),`
Original file line number	Diff line number	Diff line change
`@@ -54,9 +54,7 @@ fn name(`
`54`	`54`	`} else {`
`55`	`55`	`match default {`
`56`	`56`	`OptionalArg::Present(obj) => Ok(obj),`
`57`		`- OptionalArg::Missing => {`
`58`		`- Err(vm.new_value_error("character name not found!".to_string()))`
`59`		`- }`
	`57`	`+ OptionalArg::Missing => Err(vm.new_value_error("character name not found!".to_string())),`
`60`	`58`	`}`
`61`	`59`	`}`
`62`	`60`	`}`