Rollup merge of #64475 - guanqun:use-same-name, r=Centril

Centril · web-flow · commit 88bd5646f13b · 2019-09-15T02:29:49.000+02:00
simplify the initialization
diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs
@@ -400,7 +400,7 @@ pub struct UnsafetyState {
 
 impl UnsafetyState {
     pub fn function(unsafety: hir::Unsafety, def: hir::HirId) -> UnsafetyState {
-        UnsafetyState { def: def, unsafety: unsafety, unsafe_push_count: 0, from_fn: true }
+        UnsafetyState { def, unsafety, unsafe_push_count: 0, from_fn: true }
     }
 
     pub fn recurse(&mut self, blk: &hir::Block) -> UnsafetyState {

Original file line number	Diff line number	Diff line change
`@@ -400,7 +400,7 @@ pub struct UnsafetyState {`
`400`	`400`
`401`	`401`	`impl UnsafetyState {`
`402`	`402`	`pub fn function(unsafety: hir::Unsafety, def: hir::HirId) -> UnsafetyState {`
`403`		`- UnsafetyState { def: def, unsafety: unsafety, unsafe_push_count: 0, from_fn: true }`
	`403`	`+ UnsafetyState { def, unsafety, unsafe_push_count: 0, from_fn: true }`
`404`	`404`	`}`
`405`	`405`
`406`	`406`	`pub fn recurse(&mut self, blk: &hir::Block) -> UnsafetyState {`