Skip to content

Commit

Permalink
Merge branch 'nodejs:master' into esm/license2rtf
Browse files Browse the repository at this point in the history
  • Loading branch information
F3n67u committed May 15, 2022
2 parents ed9f4e6 + 347000c commit c41fa26
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-windows.yml
Expand Up @@ -32,7 +32,7 @@ jobs:
if: github.event.pull_request.draft == false
strategy:
matrix:
windows: [windows-2019, windows-2022]
windows: [windows-2019]
fail-fast: false
runs-on: ${{ matrix.windows }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coverage-windows.yml
Expand Up @@ -33,7 +33,7 @@ env:
jobs:
coverage-windows:
if: github.event.pull_request.draft == false
runs-on: windows-latest
runs-on: windows-2019
steps:
- uses: actions/checkout@v3
with:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test-asan.yml
Expand Up @@ -30,6 +30,7 @@ concurrency:
cancel-in-progress: true

env:
ASAN_OPTIONS: intercept_tls_get_addr=0
PYTHON_VERSION: '3.10'
FLAKY_TESTS: dontcare

Expand Down
5 changes: 3 additions & 2 deletions .mailmap
Expand Up @@ -198,8 +198,6 @@ Hassaan Pasha <pasha.hassaan@gmail.com> <hassaan.pasha@teamo.io>
Hendrik Schwalm <mail@hendrikschwalm.de>
Henry Chin <hheennrryy@gmail.com>
Herbert Vojčík <herby@mailbox.sk>
Zeyu "Alex" Yang <himself65@outlook.com> <himself65@mask.io>
Zeyu "Alex" Yang <himself65@outlook.com> <himself6565@gmail.com>
Hitesh Kanwathirtha <hiteshk@microsoft.com> <digitalinfinity@gmail.com>
Icer Liang <liangshuangde@163.com> <wizicer@users.noreply.github.com>
Igor Savin <iselwin@gmail.com>
Expand Down Expand Up @@ -382,6 +380,7 @@ Oluwaseun Omoyajowo <omoyajowo2015@gmail.com>
OneNail <OneNail@yeah.net> <onenail@yeah.net>
Onne Gorter <onne@onnlucky.com>
Oscar Martinez <oscar@mtnz-web.com> <oscar.martinez@hautelook.com>
Paolo Insogna <paolo@cowtech.it>
Paul Graham <homosaur@gmail.com> <paul@bytefair.com>
Paul Querna <pquerna@apache.org> <paul@querna.org>
Pedro Lima <pvsousalima@gmail.com>
Expand Down Expand Up @@ -564,6 +563,8 @@ Yuta Hiroto <git@about-hiroppy.com>
Zach Bjornson <bjornson@stanford.edu> <zbbjornson@gmail.com>
Zachary Scott <zachary@zacharyscott.net> <zachary.s.scott@gmail.com>
Zachary Vacura <admin@hackzzila.com>
Zeyu "Alex" Yang <himself65@outlook.com> <himself65@mask.io>
Zeyu "Alex" Yang <himself65@outlook.com> <himself6565@gmail.com>
Zoran Tomicic <ztomicic@gmail.com>
Сковорода Никита Андреевич <chalkerx@gmail.com>
隋鑫磊 <joshuasui@163.com>
2 changes: 1 addition & 1 deletion doc/api/modules.md
Expand Up @@ -562,7 +562,7 @@ wrapper that looks like the following:

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

* It keeps top-level variables (defined with `var`, `const` or `let`) scoped to
* It keeps top-level variables (defined with `var`, `const`, or `let`) scoped to
the module rather than the global object.
* It helps to provide some global-looking variables that are actually specific
to the module, such as:
Expand Down
2 changes: 1 addition & 1 deletion lib/internal/fs/promises.js
Expand Up @@ -528,7 +528,7 @@ async function read(handle, bufferOrParams, offset, length, position) {
offset = 0,
length = buffer.byteLength - offset,
position = null
} = offset ?? ObjectCreate(null));
} = offset);
}

if (offset == null) {
Expand Down

0 comments on commit c41fa26

Please sign in to comment.