Skip to content

Rust: update rust-analyzer #18295

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

Merged
aibaars merged 8 commits into from
Dec 18, 2024
Merged

Rust: update rust-analyzer #18295

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3928efe
Rust: update rust.ungram
aibaars Dec 16, 2024
8e7eedc
Update codegen/grammar
aibaars Dec 16, 2024
93972fc
Run: misc/bazel/3rdparty/update_cargo_deps.sh
aibaars Dec 16, 2024
c13e173
Rust: fix codegeneration for AsmOptions
aibaars Dec 16, 2024
029e260
Rust: //rust/codegen
aibaars Dec 16, 2024
23e6a82
Rust: fix QL code
aibaars Dec 16, 2024
71959f5
Rust: address clippy warnings
aibaars Dec 16, 2024
a6ec51a
Rust: update expected output
aibaars Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rust/ast-generator/rust.ungram
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ AsmClobberAbi = 'clobber_abi' '(' ('@string' (',' '@string')* ','?) ')'
// option := "pure" / "nomem" / "readonly" / "preserves_flags" / "noreturn" / "nostack" / "att_syntax" / "raw"
AsmOption = 'pure' | 'nomem' | 'readonly' | 'preserves_flags' | 'noreturn' | 'nostack' | 'att_syntax' | 'raw' | 'may_unwind'
// options := "options(" option *("," option) [","] ")"
AsmOptions = 'options' '(' AsmOption *(',' AsmOption) ','? ')'
AsmOptions = 'options' '(' (AsmOption (',' AsmOption)* ','?) ')'
Copy link
Contributor

@redsun82 redsun82 Dec 18, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this a change on top of the upstream ungram? If that's the case, this might make it tricky to grab this file directly from there at some point in the future...

Copy link
Contributor

@redsun82 redsun82 Dec 18, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, it is. Can you explain why you needed this? Could there be a way to avoid this patching?

Copy link
Contributor Author

@aibaars aibaars Dec 18, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I should push this upstream as a fix. It looks like a bug to me.

Copy link
Contributor

@redsun82 redsun82 Dec 18, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm still ok with merging this as it is 🙂

Copy link
Contributor Author

@aibaars aibaars Dec 18, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rust-lang/rust-analyzer#18715

Copy link
Contributor Author

@aibaars aibaars Dec 18, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wow these rust-analyzer folk are quick, the upstream patch is already merged!

AsmLabel = 'label' BlockExpr
AsmSym = 'sym' Path
AsmConst = 'const' Expr
Expand Down
1 change: 1 addition & 0 deletions rust/ast-generator/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ fn class_name(type_name: &str) -> String {
"Fn" => "Function".to_owned(),
"Literal" => "LiteralExpr".to_owned(),
"ArrayExpr" => "ArrayExprInternal".to_owned(),
"AsmOptions" => "AsmOptionsList".to_owned(),
_ if type_name.ends_with("Type") => format!("{}Repr", type_name),
_ => type_name.to_owned(),
}
Expand Down