openharmony/third_party_rust_syn
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_rust_syn synced 2024-11-23 16:00:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Parse destructuring assignment

Browse Source
This commit is contained in:
David Tolnay 2020-11-26 23:05:43 -08:00
parent 785c8c9e37
commit 8ae9129a4a
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/expr.rs
View File

@ -1044,6 +1044,8 @@ pub(crate) mod parsing {
use super::*;
use crate::parse::{Parse, ParseStream, Result};
use crate::path;
#[cfg(feature = "full")]
use proc_macro2::TokenTree;
use std::cmp::Ordering;
crate::custom_keyword!(raw);
@ -1724,6 +1726,10 @@ pub(crate) mod parsing {
input.call(expr_block).map(Expr::Block)
} else if input.peek(Token![..]) {
expr_range(input, allow_struct).map(Expr::Range)
} else if input.peek(Token![_]) {
Ok(Expr::Verbatim(TokenStream::from(
input.parse::<TokenTree>()?,
)))
} else if input.peek(Lifetime) {
let the_label: Label = input.parse()?;
let mut expr = if input.peek(Token![while]) {
@ -2451,7 +2457,11 @@ pub(crate) mod parsing {
path,
fields,
dot2_token: Some(content.parse()?),
rest: Some(Box::new(content.parse()?)),
rest: if content.is_empty() {
None
} else {
Some(Box::new(content.parse()?))
},
});
}
@ -2672,8 +2682,6 @@ pub(crate) mod printing {
use super::*;
#[cfg(feature = "full")]
use crate::attr::FilterAttrs;
#[cfg(feature = "full")]
use crate::print::TokensOrDefault;
use proc_macro2::{Literal, TokenStream};
use quote::{ToTokens, TokenStreamExt};
@ -3181,10 +3189,12 @@ pub(crate) mod printing {
self.brace_token.surround(tokens, |tokens| {
inner_attrs_to_tokens(&self.attrs, tokens);
self.fields.to_tokens(tokens);
if self.rest.is_some() {
TokensOrDefault(&self.dot2_token).to_tokens(tokens);
self.rest.to_tokens(tokens);
if let Some(dot2_token) = &self.dot2_token {
dot2_token.to_tokens(tokens);
} else if self.rest.is_some() {
Token![..](Span::call_site()).to_tokens(tokens);
}
self.rest.to_tokens(tokens);
})
}
}

8
tests/repo/mod.rs
View File

@ -12,14 +12,6 @@ const REVISION: &str = "72da5a9d85a522b11e80d0fdd1fd95247d442604";
#[rustfmt::skip]
static EXCLUDE: &[&str] = &[
// TODO destructuring assignment (#933)
"src/test/ui/destructuring-assignment/drop-order.rs",
"src/test/ui/destructuring-assignment/nested_destructure.rs",
"src/test/ui/destructuring-assignment/slice_destructure.rs",
"src/test/ui/destructuring-assignment/struct_destructure.rs",
"src/test/ui/destructuring-assignment/tuple_destructure.rs",
"src/test/ui/destructuring-assignment/tuple_struct_destructure.rs",
// Compile-fail expr parameter in const generic position: f::<1 + 2>()
"src/test/ui/const-generics/closing-args-token.rs",
"src/test/ui/const-generics/const-expression-parameter.rs",