Skip to content

Commit ccf2a6a

Browse files
authored
Merge branch 'master' into xiaohaoliang-patch-1
2 parents 764494a + 06af233 commit ccf2a6a

File tree

1,454 files changed

+74226
-23704
lines changed

Some content is hidden

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

1,454 files changed

+74226
-23704
lines changed

.clang_complete

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@
44
-Igens
55
-I.
66
-Ithird_party/boringssl/include
7+
-Ithird_party/benchmark/include
78
-Ithird_party/zlib
89
-Ithird_party/protobuf/src

.gitignore

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ objs
88
# Python items
99
cython_debug/
1010
python_build/
11-
python_format_venv/
11+
yapf_virtual_environment/
1212
python_pylint_venv/
1313
.coverage*
1414
.eggs
@@ -115,3 +115,16 @@ bazel-testlogs
115115

116116
# Debug output
117117
gdb.txt
118+
119+
# ctags file
120+
tags
121+
122+
# perf data
123+
perf.data
124+
perf.data.old
125+
126+
# bm_diff
127+
bm_diff_new/
128+
bm_diff_old/
129+
bm_*.json
130+

.gitmodules

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,13 @@
1414
[submodule "third_party/boringssl"]
1515
path = third_party/boringssl
1616
url = https://github.com/google/boringssl.git
17-
[submodule "third_party/thrift"]
18-
path = third_party/thrift
19-
url = https://github.com/apache/thrift.git
2017
[submodule "third_party/benchmark"]
2118
path = third_party/benchmark
2219
url = https://github.com/google/benchmark
2320
[submodule "third_party/boringssl-with-bazel"]
2421
path = third_party/boringssl-with-bazel
2522
url = https://boringssl.googlesource.com/boringssl
23+
[submodule "third_party/cares/cares"]
24+
path = third_party/cares/cares
25+
url = https://github.com/c-ares/c-ares.git
26+
branch = cares-1_12_0

.pylintrc

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,34 +3,38 @@
33
# not include "unused_" and "ignored_" by default?
44
dummy-variables-rgx=^ignored_|^unused_
55

6+
[DESIGN]
7+
# NOTE(nathaniel): Not particularly attached to this value; it just seems to
8+
# be what works for us at the moment (excepting the dead-code-walking Beta
9+
# API).
10+
max-args=6
11+
12+
[MISCELLANEOUS]
13+
# NOTE(nathaniel): We are big fans of "TODO(<issue link>): " and
14+
# "NOTE(<username or issue link>): ". We do not allow "TODO:",
15+
# "TODO(<username>):", "FIXME:", or anything else.
16+
notes=FIXME,XXX
17+
618
[MESSAGES CONTROL]
719

820
#TODO: Enable missing-docstring
921
#TODO: Enable too-few-public-methods
10-
#TODO: Enable too-many-arguments
1122
#TODO: Enable no-init
1223
#TODO: Enable duplicate-code
1324
#TODO: Enable invalid-name
14-
#TODO: Enable suppressed-message
1525
#TODO: Enable locally-disabled
1626
#TODO: Enable protected-access
1727
#TODO: Enable no-name-in-module
18-
#TODO: Enable unused-argument
19-
#TODO: Enable fixme
2028
#TODO: Enable wrong-import-order
21-
#TODO: Enable no-value-for-parameter
22-
#TODO: Enable cyclic-import
23-
#TODO: Enable redefined-outer-name
29+
# TODO(https://github.com/PyCQA/pylint/issues/59#issuecomment-283774279):
30+
# enable cyclic-import after a 1.7-or-later pylint release that recognizes our
31+
# disable=cyclic-import suppressions.
2432
#TODO: Enable too-many-instance-attributes
25-
#TODO: Enable broad-except
26-
#TODO: Enable too-many-locals
2733
#TODO: Enable too-many-lines
2834
#TODO: Enable redefined-variable-type
2935
#TODO: Enable next-method-called
3036
#TODO: Enable import-error
3137
#TODO: Enable useless-else-on-loop
32-
#TODO: Enable too-many-return-statements
3338
#TODO: Enable too-many-nested-blocks
34-
#TODO: Enable super-init-not-called
3539

36-
disable=missing-docstring,too-few-public-methods,too-many-arguments,no-init,duplicate-code,invalid-name,suppressed-message,locally-disabled,protected-access,no-name-in-module,unused-argument,fixme,wrong-import-order,no-value-for-parameter,cyclic-import,redefined-outer-name,too-many-instance-attributes,broad-except,too-many-locals,too-many-lines,redefined-variable-type,next-method-called,import-error,useless-else-on-loop,too-many-return-statements,too-many-nested-blocks,super-init-not-called
40+
disable=missing-docstring,too-few-public-methods,no-init,duplicate-code,invalid-name,locally-disabled,protected-access,no-name-in-module,wrong-import-order,cyclic-import,too-many-instance-attributes,too-many-lines,redefined-variable-type,next-method-called,import-error,useless-else-on-loop,too-many-nested-blocks

.vscode/launch.json

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"version": "0.2.0",
3+
"configurations": [
4+
{
5+
"type": "node",
6+
"request": "launch",
7+
"name": "Mocha Tests",
8+
"cwd": "${workspaceRoot}",
9+
"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/mocha",
10+
"windows": {
11+
"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/mocha.cmd"
12+
},
13+
"runtimeArgs": [
14+
"-u",
15+
"tdd",
16+
"--timeout",
17+
"999999",
18+
"--colors",
19+
"${workspaceRoot}/src/node/test"
20+
],
21+
"internalConsoleOptions": "openOnSessionStart"
22+
},
23+
{
24+
"type": "node",
25+
"request": "attach",
26+
"name": "Attach to Process",
27+
"port": 5858
28+
}
29+
]
30+
}

0 commit comments

Comments
 (0)