Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Parse dyn* syntax #1213

Merged
merged 1 commit into from Sep 18, 2022
Merged

Parse dyn* syntax #1213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/ty.rs
View file
Open in desktop
Expand Up @@ -537,9 +537,15 @@ pub mod parsing {
|| lookahead.peek(Token![::])
|| lookahead.peek(Token![<])
{
if input.peek(Token![dyn]) {
let trait_object = TypeTraitObject::parse(input, allow_plus)?;
return Ok(Type::TraitObject(trait_object));
let dyn_token: Option<Token![dyn]> = input.parse()?;
if dyn_token.is_some() {
let star_token: Option<Token![*]> = input.parse()?;
let bounds = TypeTraitObject::parse_bounds(input, allow_plus)?;
return Ok(if star_token.is_some() {
Type::Verbatim(verbatim::between(begin, input))
} else {
Type::TraitObject(TypeTraitObject { dyn_token, bounds })
});
}

let ty: TypePath = input.parse()?;
Expand Down
7 changes: 0 additions & 7 deletions tests/repo/mod.rs
View file
Open in desktop
Expand Up @@ -14,13 +14,6 @@ const REVISION: &str = "98ad6a5519651af36e246c0335c964dd52c554ba";

#[rustfmt::skip]
static EXCLUDE_FILES: &[&str] = &[
// TODO: dyn*
"src/test/ui/dyn-star/const.rs",
"src/test/ui/dyn-star/drop.rs",
"src/test/ui/dyn-star/make-dyn-star.rs",
"src/test/ui/dyn-star/method.rs",
"src/test/ui/dyn-star/syntax.rs",

// TODO: Struct { #[attr] .. } in pattern position
"src/tools/rust-analyzer/crates/parser/test_data/parser/inline/ok/0102_record_pat_field_list.rs",

Expand Down