Update compiler/rustc_parse/src/parser/expr.rs

notriddle · petrochenkov · notriddle · commit 9fcb9c664833 · 2022-07-12T09:51:20.000-07:00
Co-authored-by: Vadim Petrochenkov &lt;vadim.petrochenkov@gmail.com&gt;
diff --git a/compiler/rustc_parse/src/parser/expr.rs b/compiler/rustc_parse/src/parser/expr.rs
@@ -3012,7 +3012,7 @@ impl<'a> Parser<'a> {
                 }
             };
 
-            let is_shorthand = parsed_field.as_ref().map_or(false, |f| f.ident.span == f.expr.span);
+            let is_shorthand = parsed_field.as_ref().map_or(false, |f| f.is_shorthand);
             // A shorthand field can be turned into a full field with `:`.
             // We should point this out.
             self.check_or_expected(!is_shorthand, TokenType::Token(token::Colon));

Original file line number	Diff line number	Diff line change
`@@ -3012,7 +3012,7 @@ impl<'a> Parser<'a> {`
`3012`	`3012`	`}`
`3013`	`3013`	`};`
`3014`	`3014`
`3015`		`- let is_shorthand = parsed_field.as_ref().map_or(false, \|f\| f.ident.span == f.expr.span);`
	`3015`	`+ let is_shorthand = parsed_field.as_ref().map_or(false, \|f\| f.is_shorthand);`
`3016`	`3016`	// A shorthand field can be turned into a full field with `:`.
`3017`	`3017`	`// We should point this out.`
`3018`	`3018`	`self.check_or_expected(!is_shorthand, TokenType::Token(token::Colon));`