bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #100566 - TaKO8Ki:use-create-snapshot-for-diagnostic, r=cjgillot

Browse source 
Use `create_snapshot_for_diagnostic` instead of `clone` for `Parser`

follow-up to #98020
This commit is contained in:
Matthias Krüger 2022-08-15 10:28:14 +02:00 • committed by GitHub
commit fece51174b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_parse/src/parser/item.rs
View file

@ -2309,7 +2309,7 @@ impl<'a> Parser<'a> {
(pat, this.parse_ty_for_param()?) (pat, this.parse_ty_for_param()?)
} else { } else {
debug!("parse_param_general ident_to_pat"); debug!("parse_param_general ident_to_pat");
let parser_snapshot_before_ty = this.clone(); let parser_snapshot_before_ty = this.create_snapshot_for_diagnostic();
this.eat_incorrect_doc_comment_for_param_type(); this.eat_incorrect_doc_comment_for_param_type();
let mut ty = this.parse_ty_for_param(); let mut ty = this.parse_ty_for_param();
if ty.is_ok() if ty.is_ok()
@ -2332,7 +2332,7 @@ impl<'a> Parser<'a> {
// Recover from attempting to parse the argument as a type without pattern. // Recover from attempting to parse the argument as a type without pattern.
Err(err) => { Err(err) => {
err.cancel(); err.cancel();
*this = parser_snapshot_before_ty; this.restore_snapshot(parser_snapshot_before_ty);
this.recover_arg_parse()? this.recover_arg_parse()?
} }
} }