Skip to content

Commit 50d83ad

Browse files
authored
Merge branch 'main' into redsun82/update-rules-rust
2 parents 4ca0712 + 7d53898 commit 50d83ad

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

.github/dependabot.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,5 @@ updates:
4545
directory: "/"
4646
schedule:
4747
interval: weekly
48+
exclude-paths:
49+
- "misc/bazel/registry/**"

MODULE.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ local_path_override(
1515
# see https://registry.bazel.build/ for a list of available packages
1616

1717
bazel_dep(name = "platforms", version = "1.0.0")
18-
bazel_dep(name = "rules_cc", version = "0.2.16")
19-
bazel_dep(name = "rules_go", version = "0.59.0")
18+
bazel_dep(name = "rules_cc", version = "0.2.17")
19+
bazel_dep(name = "rules_go", version = "0.60.0")
2020
bazel_dep(name = "rules_java", version = "9.0.3")
2121
bazel_dep(name = "rules_pkg", version = "1.0.1")
2222
bazel_dep(name = "rules_nodejs", version = "6.7.3")

rust/ql/lib/codeql/rust/internal/typeinference/TypeInference.qll

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3040,7 +3040,9 @@ private module ConstructionMatchingInput implements MatchingInputSig {
30403040

30413041
override AstNode getNodeAt(AccessPosition apos) {
30423042
result =
3043-
this.getFieldExpr(this.getNthStructField(apos.asPosition()).getName().getText()).getExpr()
3043+
this.getFieldExpr(pragma[only_bind_into](this.getNthStructField(apos.asPosition())
3044+
.getName()
3045+
.getText())).getExpr()
30443046
or
30453047
result = this and apos.isReturn()
30463048
}
@@ -3573,7 +3575,9 @@ private module DeconstructionPatMatchingInput implements MatchingInputSig {
35733575
this =
35743576
any(StructPat sp |
35753577
result =
3576-
sp.getPatField(sp.getNthStructField(apos.asPosition()).getName().getText()).getPat()
3578+
sp.getPatField(pragma[only_bind_into](sp.getNthStructField(apos.asPosition())
3579+
.getName()
3580+
.getText())).getPat()
35773581
)
35783582
or
35793583
result = this.(TupleStructPat).getField(apos.asPosition())

0 commit comments

Comments
 (0)