Skip to content
This repository was archived by the owner on Oct 15, 2020. It is now read-only.

Commit 373752f

Browse files
chakrabotMSLaguana
authored andcommitted
meta: merge node/master into node-chakracore/master
Merge ac829f0 as of 2018-02-06 This commit was automatically generated. For any problems, please contact jackhorton Reviewed-By: Jimmy Thomson <jithomso@microsoft.com>
2 parents 3ad3d00 + ac829f0 commit 373752f

Some content is hidden

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

61 files changed

+3407
-393
lines changed

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1186,6 +1186,7 @@ lint: ## Run JS, C++, MD and doc linters.
11861186
$(MAKE) lint-js || EXIT_STATUS=$$? ; \
11871187
$(MAKE) lint-cpp || EXIT_STATUS=$$? ; \
11881188
$(MAKE) lint-addon-docs || EXIT_STATUS=$$? ; \
1189+
$(MAKE) lint-md || EXIT_STATUS=$$? ; \
11891190
exit $$EXIT_STATUS
11901191
CONFLICT_RE=^>>>>>>> [0-9A-Fa-f]+|^<<<<<<< [A-Za-z]+
11911192

benchmark/fs/bench-stat-promise.js

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
'use strict';
2+
3+
const common = require('../common');
4+
const fs = require('fs');
5+
6+
const bench = common.createBenchmark(main, {
7+
n: [20e4],
8+
statType: ['fstat', 'lstat', 'stat']
9+
});
10+
11+
async function run(n, statType) {
12+
const arg = statType === 'fstat' ?
13+
await fs.promises.open(__filename, 'r') : __filename;
14+
let remaining = n;
15+
bench.start();
16+
while (remaining-- > 0)
17+
await fs.promises[statType](arg);
18+
bench.end(n);
19+
20+
if (typeof arg.close === 'function')
21+
await arg.close();
22+
}
23+
24+
function main(conf) {
25+
const n = conf.n >>> 0;
26+
const statType = conf.statType;
27+
run(n, statType).catch(console.log);
28+
}

doc/api/deprecations.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -840,31 +840,32 @@ Assigning properties to the top-level `this` as an alternative
840840
to `module.exports` is deprecated. Developers should use `exports`
841841
or `module.exports` instead.
842842
843-
### DEP00XX: crypto.fips is deprecated and replaced.
843+
<a id="DEP0093"></a>
844+
### DEP0093: crypto.fips is deprecated and replaced.
844845
845846
Type: Documentation-only
846847
847848
The [`crypto.fips`][] property is deprecated. Please use `crypto.setFips()`
848849
and `crypto.getFips()` instead.
849850
850-
<a id="DEP0XX"></a>
851-
### DEP0XXX: Using `assert.fail()` with more than one argument.
851+
<a id="DEP0094"></a>
852+
### DEP0094: Using `assert.fail()` with more than one argument.
852853
853854
Type: Runtime
854855
855856
Using `assert.fail()` with more than one argument has no benefit over writing an
856857
individual error message. Either use `assert.fail()` with one argument or switch
857858
to one of the other assert methods.
858859
859-
<a id="DEP00XX"></a>
860-
### DEP00XX: timers.enroll()
860+
<a id="DEP0095"></a>
861+
### DEP0095: timers.enroll()
861862
862863
Type: Runtime
863864
864865
`timers.enroll()` is deprecated. Please use the publicly documented [`setTimeout()`][] or [`setInterval()`][] instead.
865866
866-
<a id="DEP00XX"></a>
867-
### DEP00XX: timers.unenroll()
867+
<a id="DEP0096"></a>
868+
### DEP0096: timers.unenroll()
868869
869870
Type: Runtime
870871

0 commit comments

Comments
 (0)