Skip to content

Commit dc8593a

Browse files
authored
Merge branch 'nodejs:master' into esm/build-addon
2 parents 4ea0c86 + 347000c commit dc8593a

File tree

6 files changed

+8
-6
lines changed

6 files changed

+8
-6
lines changed

.github/workflows/build-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
if: github.event.pull_request.draft == false
3333
strategy:
3434
matrix:
35-
windows: [windows-2019, windows-2022]
35+
windows: [windows-2019]
3636
fail-fast: false
3737
runs-on: ${{ matrix.windows }}
3838
steps:

.github/workflows/coverage-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ env:
3333
jobs:
3434
coverage-windows:
3535
if: github.event.pull_request.draft == false
36-
runs-on: windows-latest
36+
runs-on: windows-2019
3737
steps:
3838
- uses: actions/checkout@v3
3939
with:

.github/workflows/test-asan.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ concurrency:
3030
cancel-in-progress: true
3131

3232
env:
33+
ASAN_OPTIONS: intercept_tls_get_addr=0
3334
PYTHON_VERSION: '3.10'
3435
FLAKY_TESTS: dontcare
3536

.mailmap

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,6 @@ Hassaan Pasha <[email protected]> <[email protected]>
198198
Hendrik Schwalm <[email protected]>
199199
Henry Chin <[email protected]>
200200
Herbert Vojčík <[email protected]>
201-
202-
203201
Hitesh Kanwathirtha <[email protected]> <[email protected]>
204202
205203
Igor Savin <[email protected]>
@@ -382,6 +380,7 @@ Oluwaseun Omoyajowo <[email protected]>
382380
383381
Onne Gorter <[email protected]>
384382
383+
Paolo Insogna <[email protected]>
385384
386385
387386
Pedro Lima <[email protected]>
@@ -564,6 +563,8 @@ Yuta Hiroto <[email protected]>
564563
565564
566565
Zachary Vacura <[email protected]>
566+
567+
567568
Zoran Tomicic <[email protected]>
568569
Сковорода Никита Андреевич <[email protected]>
569570
隋鑫磊 <[email protected]>

doc/api/modules.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ wrapper that looks like the following:
562562

563563
By doing this, Node.js achieves a few things:
564564

565-
* It keeps top-level variables (defined with `var`, `const` or `let`) scoped to
565+
* It keeps top-level variables (defined with `var`, `const`, or `let`) scoped to
566566
the module rather than the global object.
567567
* It helps to provide some global-looking variables that are actually specific
568568
to the module, such as:

lib/internal/fs/promises.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ async function read(handle, bufferOrParams, offset, length, position) {
528528
offset = 0,
529529
length = buffer.byteLength - offset,
530530
position = null
531-
} = offset ?? ObjectCreate(null));
531+
} = offset);
532532
}
533533

534534
if (offset == null) {

0 commit comments

Comments
 (0)