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

Rust: update rust-analyzer #18295

Merged
merged 8 commits into from
Dec 18, 2024
Merged

Rust: update rust-analyzer #18295

merged 8 commits into from
Dec 18, 2024

Conversation

aibaars
Copy link
Contributor

@aibaars aibaars commented Dec 16, 2024

Updates rust-analyzer to 0.0.248

@github-actions github-actions bot added the Rust Pull requests that update Rust code label Dec 16, 2024
@aibaars aibaars force-pushed the aibaars/update-rust-ungram branch from 946bcde to 72afa69 Compare December 16, 2024 13:30
github-advanced-security[bot]
github-advanced-security bot found potential problems Dec 16, 2024
View reviewed changes
rust/ql/lib/codeql/rust/elements.qll
@@ -11,7 +11,20 @@
import codeql.rust.elements.ArrayListExpr
import codeql.rust.elements.ArrayRepeatExpr
import codeql.rust.elements.ArrayTypeRepr
import codeql.rust.elements.AsmClobberAbi
import codeql.rust.elements.AsmConst
import codeql.rust.elements.AsmDirSpec

Check warning

Code scanning / CodeQL

Redundant import Warning

Redundant import, the module is already imported inside
codeql.rust.elements.AsmRegOperand
Loading
.
rust/ql/lib/codeql/rust/elements.qll
import codeql.rust.elements.AsmExpr
import codeql.rust.elements.AsmLabel

Check warning

Code scanning / CodeQL

Redundant import Warning

Redundant import, the module is already imported inside
codeql.rust.elements.Abi
Loading
.
Redundant import, the module is already imported inside
codeql.rust.elements.Addressable
Loading
.
Redundant import, the module is already imported inside
codeql.rust.elements.ArgList
Loading
.
Redundant import, the module is already imported inside
codeql.rust.elements.AsmDirSpec
Loading
.
Redundant import, the module is already imported inside
codeql.rust.elements.AsmOperand
Loading
.
Redundant import, the module is already imported inside
codeql.rust.elements.AsmOperandExpr
Loading
.
Redundant import, the module is already imported inside
codeql.rust.elements.AsmOption
Loading
.
Redundant import, the module is already imported inside
codeql.rust.elements.AsmPiece
Loading
.
Redundant import, the module is already imported inside
codeql.rust.elements.AsmRegSpec
Loading
.
Redundant import, the module is already imported inside
codeql.rust.elements.AssocItem
Loading
.
Redundant import, the module is already imported inside
codeql.rust.elements.AssocItemList
Loading
.
Redundant import, the module is already imported inside
codeql.rust.elements.Attr
Loading
.
Redundant import, the module is already imported inside
codeql.rust.elements.Callable
Loading
.
Redundant import, the module is already imported inside
codeql.rust.elements.ClosureBinder
Loading
.
Redundant import, the module is already imported inside
codeql.rust.elements.Comment
Loading
.
Redundant import, the module is already imported inside
codeql.rust.elements.Expr
Loading
.
Redundant import, the module is already imported inside
codeql.rust.elements.ExternItem
Loading
.
Redundant import, the module is already imported inside
codeql.rust.elements.ExternItemList
Loading
.
Redundant import, the module is already imported inside
codeql.rust.elements.FieldList
Loading
.
Redundant import, the module is already imported inside
codeql.rust.elements.FormatArgsArg
Loading
.
Redundant import, the module is already imported inside
codeql.rust.elements.GenericArg
Loading
.
Redundant import, the module is already imported inside
codeql.rust.elements.GenericArgList
Loading
.
Redundant import, the module is already imported inside
codeql.rust.elements.GenericParam
Loading
.
Redundant import, the module is already imported inside
codeql.rust.elements.GenericParamList
Loading
.
Redundant import, the module is already imported inside
codeql.rust.elements.ItemList
Loading
.
Redundant import, the module is already imported inside
codeql.rust.elements.Label
Loading
.
Redundant import, the module is already imported inside
codeql.rust.elements.LetElse
Loading
.
Redundant import, the module is already imported inside
codeql.rust.elements.MacroCall
Loading
.
Redundant import, the module is already imported inside
codeql.rust.elements.MacroItems
Loading
.
Redundant import, the module is already imported inside
codeql.rust.elements.MacroStmts
Loading
.
Redundant import, the module is already imported inside
codeql.rust.elements.MatchArm
Loading
.
Redundant import, the module is already imported inside
codeql.rust.elements.MatchArmList
Loading
.
Redundant import, the module is already imported inside
codeql.rust.elements.MatchGuard
Loading
.
Redundant import, the module is already imported inside
codeql.rust.elements.Meta
Loading
.
Redundant import, the module is already imported inside
codeql.rust.elements.Name
Loading
.
Redundant import, the module is already imported inside
codeql.rust.elements.ParamBase
Loading
.
Redundant import, the module is already imported inside
codeql.rust.elements.ParamList
Loading
.
Redundant import, the module is already imported inside
codeql.rust.elements.ParenthesizedArgList
Loading
.
Redundant import, the module is already imported inside
codeql.rust.elements.Pat
Loading
.
Redundant import, the module is already imported inside
codeql.rust.elements.Path
Loading
.
Redundant import, the module is already imported inside
codeql.rust.elements.PathSegment
Loading
.
Redundant import, the module is already imported inside
codeql.rust.elements.RecordExprField
Loading
.
Redundant import, the module is already imported inside
codeql.rust.elements.RecordExprFieldList
Loading
.
Redundant import, the module is alr
rust/ql/lib/codeql/rust/elements.qll
import codeql.rust.elements.AsmExpr
import codeql.rust.elements.AsmLabel
import codeql.rust.elements.AsmOperand

Check warning

Code scanning / CodeQL

Redundant import Warning

Redundant import, the module is already imported inside
codeql.rust.elements.AsmConst
Loading
.
Redundant import, the module is already imported inside
codeql.rust.elements.AsmLabel
Loading
.
Redundant import, the module is already imported inside
codeql.rust.elements.AsmOperandNamed
Loading
.
Redundant import, the module is already imported inside
codeql.rust.elements.AsmRegOperand
Loading
.
Redundant import, the module is already imported inside
codeql.rust.elements.AsmSym
Loading
.
rust/ql/lib/codeql/rust/elements.qll
import codeql.rust.elements.AsmExpr
import codeql.rust.elements.AsmLabel
import codeql.rust.elements.AsmOperand
import codeql.rust.elements.AsmOperandExpr

Check warning

Code scanning / CodeQL

Redundant import Warning

Redundant import, the module is already imported inside
codeql.rust.elements.AsmRegOperand
Loading
.
rust/ql/lib/codeql/rust/elements.qll Fixed Show fixed Hide fixed
rust/ql/lib/codeql/rust/elements.qll
@@ -107,6 +120,7 @@
import codeql.rust.elements.ParenExpr
import codeql.rust.elements.ParenPat
import codeql.rust.elements.ParenTypeRepr
import codeql.rust.elements.ParenthesizedArgList

Check warning

Code scanning / CodeQL

Redundant import Warning

Redundant import, the module is already imported inside
codeql.rust.elements.PathSegment
Loading
.
rust/ql/lib/codeql/rust/elements.qll
@@ -166,6 +180,8 @@
import codeql.rust.elements.Unimplemented
import codeql.rust.elements.Union
import codeql.rust.elements.Use
import codeql.rust.elements.UseBoundGenericArg

Check warning

Code scanning / CodeQL

Redundant import Warning

Redundant import, the module is already imported inside
codeql.rust.elements.Lifetime
Loading
.
Redundant import, the module is already imported inside
codeql.rust.elements.NameRef
Loading
.
Redundant import, the module is already imported inside
codeql.rust.elements.UseBoundGenericArgs
Loading
.
rust/ql/lib/codeql/rust/elements.qll
@@ -166,6 +180,8 @@
import codeql.rust.elements.Unimplemented
import codeql.rust.elements.Union
import codeql.rust.elements.Use
import codeql.rust.elements.UseBoundGenericArg
import codeql.rust.elements.UseBoundGenericArgs

Check warning

Code scanning / CodeQL

Redundant import Warning

Redundant import, the module is already imported inside
codeql.rust.elements.TypeBound
Loading
.
rust/ql/lib/codeql/rust/elements/AsmOperandExpr.qll
*/

private import internal.AsmOperandExprImpl
import codeql.rust.elements.AstNode

Check warning

Code scanning / CodeQL

Redundant import Warning

Redundant import, the module is already imported inside
codeql.rust.elements.Expr
Loading
.
rust/ql/lib/codeql/rust/elements/UseBoundGenericArgs.qll
*/

private import internal.UseBoundGenericArgsImpl
import codeql.rust.elements.AstNode

Check warning

Code scanning / CodeQL

Redundant import Warning

Redundant import, the module is already imported inside
codeql.rust.elements.UseBoundGenericArg
Loading
.
@aibaars aibaars force-pushed the aibaars/update-rust-ungram branch from 72afa69 to 014b013 Compare December 16, 2024 14:51
github-advanced-security[bot]
github-advanced-security bot found potential problems Dec 16, 2024
View reviewed changes
rust/ql/lib/codeql/rust/elements.qll
import codeql.rust.elements.AsmOperand
import codeql.rust.elements.AsmOperandExpr
import codeql.rust.elements.AsmOperandNamed
import codeql.rust.elements.AsmOption

Check warning

Code scanning / CodeQL

Redundant import Warning

Redundant import, the module is already imported inside
codeql.rust.elements.AsmOptionsList
Loading
.
@aibaars aibaars force-pushed the aibaars/update-rust-ungram branch from 0631e44 to 92a10b8 Compare December 17, 2024 14:54
@redsun82 redsun82 mentioned this pull request Dec 18, 2024
Open
@aibaars aibaars force-pushed the aibaars/update-rust-ungram branch from 92a10b8 to a6ec51a Compare December 18, 2024 12:00
@aibaars aibaars marked this pull request as ready for review December 18, 2024 12:48
@aibaars aibaars requested a review from a team as a code owner December 18, 2024 12:48
redsun82
redsun82 approved these changes Dec 18, 2024
View reviewed changes
Copy link
Contributor

@redsun82 redsun82 left a comment

Choose a reason for hiding this comment

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

Just a small doubt on an ungram difference, but LGTM otherwise

rust/ast-generator/rust.ungram
@@ -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

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

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

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

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

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

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!

rust/ql/test/extractor-tests/generated/MacroItems/MacroItems.expected
@@ -1 +1 @@
| file://:0:0:0:0 | MacroItems | getNumberOfItems: | 2 |
| gen_macro_items.rs:5:5:5:38 | MacroItems | getNumberOfItems: | 2 |
Copy link
Contributor

Choose a reason for hiding this comment

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

nice! That's an improvement 👍

@aibaars aibaars merged commit 023f48f into main Dec 18, 2024
32 checks passed
@aibaars aibaars deleted the aibaars/update-rust-ungram branch December 18, 2024 15:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@redsun82 redsun82 redsun82 approved these changes

Assignees
No one assigned
Labels
Rust Pull requests that update Rust code
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@aibaars @redsun82