Skip to content

Commit f3124d3

Browse files
authored
Merge branch 'main' into main
2 parents 2f1bd93 + 45c1537 commit f3124d3

File tree

207 files changed

+38314
-6001
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

207 files changed

+38314
-6001
lines changed

.github/workflows/go-tests-other-os.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
name: Test MacOS
1313
runs-on: macos-latest
1414
steps:
15-
- name: Set up Go 1.19
15+
- name: Set up Go 1.20
1616
uses: actions/setup-go@v3
1717
with:
18-
go-version: 1.19
18+
go-version: 1.20.0
1919
id: go
2020

2121
- name: Check out code
@@ -47,10 +47,10 @@ jobs:
4747
name: Test Windows
4848
runs-on: windows-latest-xl
4949
steps:
50-
- name: Set up Go 1.19
50+
- name: Set up Go 1.20
5151
uses: actions/setup-go@v3
5252
with:
53-
go-version: 1.19
53+
go-version: 1.20.0
5454
id: go
5555

5656
- name: Check out code

.github/workflows/go-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ jobs:
2020
name: Test Linux (Ubuntu)
2121
runs-on: ubuntu-latest-xl
2222
steps:
23-
- name: Set up Go 1.19
23+
- name: Set up Go 1.20
2424
uses: actions/setup-go@v3
2525
with:
26-
go-version: 1.19
26+
go-version: 1.20.0
2727
id: go
2828

2929
- name: Check out code

go/go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
module github.com/github/codeql-go
22

3-
go 1.18
3+
go 1.20
44

55
require (
6-
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4
7-
golang.org/x/tools v0.1.12
6+
golang.org/x/mod v0.8.0
7+
golang.org/x/tools v0.6.0
88
)
99

1010
require (
11-
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
11+
golang.org/x/sys v0.5.0 // indirect
1212
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
1313
)

go/go.sum

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ golang.org/x/mod v0.5.0 h1:UG21uOlmZabA4fW5i7ZX6bjw1xELEGg/ZLgZq9auk/Q=
66
golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
77
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
88
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
9+
golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
10+
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
911
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
1012
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
1113
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
@@ -19,6 +21,8 @@ golang.org/x/sys v0.0.0-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0v
1921
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
2022
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s=
2123
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
24+
golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
25+
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
2226
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
2327
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
2428
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -28,6 +32,8 @@ golang.org/x/tools v0.1.5 h1:ouewzE6p+/VEB31YYnTbEJdi8pFqKp4P4n85vwo3DHA=
2832
golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
2933
golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
3034
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
35+
golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=
36+
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
3137
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
3238
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
3339
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1-
lgtm,codescanning
1+
---
2+
category: minorAnalysis
3+
---
24
* Support for the Twirp framework has been added.

go/ql/test/extractor-tests/diagnostics/CONSISTENCY/UnexpectedFrontendErrors.expected

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
| -:0:0:0:0 | package ; expected main |
2-
| broken2/test1.go:4:2:4:2 | undeclared name: fmt |
3-
| broken2/test1.go:5:2:5:2 | undeclared name: fmt |
4-
| broken2/test1.go:5:14:5:14 | undeclared name: a |
2+
| broken2/test1.go:4:2:4:2 | undefined: fmt |
3+
| broken2/test1.go:5:2:5:2 | undefined: fmt |
4+
| broken2/test1.go:5:14:5:14 | undefined: a |
55
| broken2/test.go:3:1:3:1 | expected 'package', found pac |
66
| broken2/test.go:3:1:3:1 | expected 'package', found pac |
77
| broken2/test.go:3:4:3:4 | expected 'IDENT', found newline |

go/ql/test/extractor-tests/diagnostics/Diagnostics.expected

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ qcompilations
55
| compilation in 'diagnostics': go-extractor -mod=vendor -- ./... | go.mod:0:0:0:0 | go.mod |
66
| compilation in 'diagnostics': go-extractor -mod=vendor -- ./... | notbroken/test.go:0:0:0:0 | notbroken/test.go |
77
qdiagnostics
8-
| broken2/test1.go:4:2:4:2 | error: undeclared name: fmt | compilation in 'diagnostics': go-extractor -mod=vendor -- ./... | broken2/test1.go:0:0:0:0 | broken2/test1.go |
9-
| broken2/test1.go:5:2:5:2 | error: undeclared name: fmt | compilation in 'diagnostics': go-extractor -mod=vendor -- ./... | broken2/test1.go:0:0:0:0 | broken2/test1.go |
10-
| broken2/test1.go:5:14:5:14 | error: undeclared name: a | compilation in 'diagnostics': go-extractor -mod=vendor -- ./... | broken2/test1.go:0:0:0:0 | broken2/test1.go |
8+
| broken2/test1.go:4:2:4:2 | error: undefined: fmt | compilation in 'diagnostics': go-extractor -mod=vendor -- ./... | broken2/test1.go:0:0:0:0 | broken2/test1.go |
9+
| broken2/test1.go:5:2:5:2 | error: undefined: fmt | compilation in 'diagnostics': go-extractor -mod=vendor -- ./... | broken2/test1.go:0:0:0:0 | broken2/test1.go |
10+
| broken2/test1.go:5:14:5:14 | error: undefined: a | compilation in 'diagnostics': go-extractor -mod=vendor -- ./... | broken2/test1.go:0:0:0:0 | broken2/test1.go |
1111
| broken/test.go:7:1:7:1 | error: expected declaration, found This | compilation in 'diagnostics': go-extractor -mod=vendor -- ./... | broken/test.go:0:0:0:0 | broken/test.go |
1212
duplicateerrs

go/ql/test/library-tests/semmle/go/Function/TypeParamType.expected

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@
1313
| TG2 | interface { } |
1414
| U | interface { } |
1515
| V | interface { int64 \| float64 } |
16+
| bytes | interface { []uint8 \| string } |
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
| unknownFunction.go:9:7:9:7 | undeclared name: unknownFunction |
1+
| unknownFunction.go:9:7:9:7 | undefined: unknownFunction |

go/ql/test/query-tests/Diagnostics/CONSISTENCY/UnexpectedFrontendErrors.expected

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
| bad.go:3:5:3:5 | expected 'IDENT', found newline |
66
| bad.go:5:1:5:1 | expected ';', found wnvwun |
77
| badimport.go:6:2:6:2 | invalid import path (invalid character U+007B '{') |
8-
| badimport.go:6:2:6:2 | invalid import path: "github.com/pkg{}" |
8+
| badimport.go:6:2:6:2 | malformed import path "github.com/pkg{}": invalid char '{' |
99
| type.go:11:9:11:9 | cannot use v (variable of type V) as T value in argument to takesT |

0 commit comments

Comments
 (0)