Skip to content

Commit e95f266

Browse files
alexv-smirnovalexv-smirnov
authored
Library import 6 (#888)
1 parent 50a65e3 commit e95f266

File tree

256 files changed

+9828
-4206
lines changed

Some content is hidden

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

256 files changed

+9828
-4206
lines changed

‎build/mapping.conf.json

+16
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,16 @@
5555
"4312064267": "https://devtools-registry.s3.yandex.net/4312064267",
5656
"4312063561": "https://devtools-registry.s3.yandex.net/4312063561",
5757
"2062930743": "https://devtools-registry.s3.yandex.net/2062930743",
58+
"4111727026": "https://devtools-registry.s3.yandex.net/4111727026",
59+
"4111727778": "https://devtools-registry.s3.yandex.net/4111727778",
60+
"5599878022": "https://devtools-registry.s3.yandex.net/5599878022",
61+
"5599877541": "https://devtools-registry.s3.yandex.net/5599877541",
62+
"5599878769": "https://devtools-registry.s3.yandex.net/5599878769",
63+
"5599877008": "https://devtools-registry.s3.yandex.net/5599877008",
64+
"5599878473": "https://devtools-registry.s3.yandex.net/5599878473",
5865
"2842390994": "https://devtools-registry.s3.yandex.net/2842390994",
5966
"5310288728": "https://devtools-registry.s3.yandex.net/5310288728",
67+
"5620327787": "https://devtools-registry.s3.yandex.net/5620327787",
6068
"2989597929": "https://devtools-registry.s3.yandex.net/2989597929",
6169
"2989596911": "https://devtools-registry.s3.yandex.net/2989596911",
6270
"2989598506": "https://devtools-registry.s3.yandex.net/2989598506",
@@ -205,8 +213,16 @@
205213
"4312064267": "black_linter for linux",
206214
"4312063561": "black_linter for linux-aarch64",
207215
"2062930743": "contrib/libs/clang11/pkg-windows-x86_64.json",
216+
"4111727026": "contrib/libs/clang14/tools/clang-format/clang-format for darwin",
217+
"4111727778": "contrib/libs/clang14/tools/clang-format/clang-format for linux",
218+
"5599878022": "contrib/python/black/bin/black for darwin",
219+
"5599877541": "contrib/python/black/bin/black for darwin-arm64",
220+
"5599878769": "contrib/python/black/bin/black for linux",
221+
"5599877008": "contrib/python/black/bin/black for linux-aarch64",
222+
"5599878473": "contrib/python/black/bin/black for win32",
208223
"2842390994": "devtools jacoco agent 0.8.7 with shaded asm",
209224
"5310288728": "devtools jstyle runner 10.12.4",
225+
"5620327787": "devtools jstyle runner 10.12.4",
210226
"2989597929": "devtools/huge_python/python for darwin",
211227
"2989596911": "devtools/huge_python/python for darwin-arm64",
212228
"2989598506": "devtools/huge_python/python for linux",

‎build/platform/java/jstyle_lib/ya.make

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ OWNER(heretic)
55
IF (USE_SYSTEM_JSTYLE_LIB)
66
MESSAGE(WARNING System java codestyle library $USE_SYSTEM_JSTYLE_LIB will be used)
77
ELSE()
8-
DECLARE_EXTERNAL_RESOURCE(JSTYLE_LIB sbr:5310288728)
8+
DECLARE_EXTERNAL_RESOURCE(JSTYLE_LIB sbr:5620327787)
99
ENDIF()
1010

1111
END()

‎build/ya.conf.json

+135
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,49 @@
1515
}
1616
}
1717
},
18+
"black": {
19+
"executable": {
20+
"black": [
21+
"black"
22+
]
23+
},
24+
"formula": {
25+
"by_platform": {
26+
"darwin-arm64": {
27+
"uri": "sbr:5599877541"
28+
},
29+
"darwin-x86_64": {
30+
"uri": "sbr:5599878022"
31+
},
32+
"linux-aarch64": {
33+
"uri": "sbr:5599877008"
34+
},
35+
"linux-x86_64": {
36+
"uri": "sbr:5599878769"
37+
},
38+
"win32-x86_64": {
39+
"uri": "sbr:5599878473"
40+
}
41+
}
42+
}
43+
},
44+
"clang-format": {
45+
"executable": {
46+
"clang-format": [
47+
"clang-format"
48+
]
49+
},
50+
"formula": {
51+
"by_platform": {
52+
"darwin-x86_64": {
53+
"uri": "sbr:4111727026"
54+
},
55+
"linux-x86_64": {
56+
"uri": "sbr:4111727778"
57+
}
58+
}
59+
}
60+
},
1861
"clang16": {
1962
"executable": {
2063
"c++": [
@@ -184,6 +227,92 @@
184227
}
185228
}
186229
},
230+
"black": {
231+
"platforms": [
232+
{
233+
"default": true,
234+
"host": {
235+
"arch": "x86_64",
236+
"os": "LINUX"
237+
}
238+
},
239+
{
240+
"default": true,
241+
"host": {
242+
"arch": "aarch64",
243+
"os": "LINUX"
244+
}
245+
},
246+
{
247+
"default": true,
248+
"host": {
249+
"os": "WIN"
250+
}
251+
},
252+
{
253+
"default": true,
254+
"host": {
255+
"os": "DARWIN"
256+
}
257+
},
258+
{
259+
"default": true,
260+
"host": {
261+
"arch": "arm64",
262+
"os": "DARWIN"
263+
}
264+
}
265+
],
266+
"tools": {
267+
"black": {
268+
"bottle": "black",
269+
"executable": "black"
270+
}
271+
}
272+
},
273+
"clang-format": {
274+
"platforms": [
275+
{
276+
"default": true,
277+
"host": {
278+
"arch": "x86_64",
279+
"os": "LINUX"
280+
}
281+
},
282+
{
283+
"default": true,
284+
"host": {
285+
"arch": "aarch64",
286+
"os": "LINUX"
287+
}
288+
},
289+
{
290+
"default": true,
291+
"host": {
292+
"os": "WIN"
293+
}
294+
},
295+
{
296+
"default": true,
297+
"host": {
298+
"os": "DARWIN"
299+
}
300+
},
301+
{
302+
"default": true,
303+
"host": {
304+
"arch": "arm64",
305+
"os": "DARWIN"
306+
}
307+
}
308+
],
309+
"tools": {
310+
"clang-format": {
311+
"bottle": "clang-format",
312+
"executable": "clang-format"
313+
}
314+
}
315+
},
187316
"clang16": {
188317
"env": {
189318
"CPATH": [
@@ -1186,6 +1315,9 @@
11861315
"atop": {
11871316
"description": "Advanced System & Process Monitor"
11881317
},
1318+
"black": {
1319+
"description": "Python styler, Python 3 only"
1320+
},
11891321
"c++": {
11901322
"description": "Run C++ compiler"
11911323
},
@@ -1195,6 +1327,9 @@
11951327
"cc": {
11961328
"description": "Run C compiler"
11971329
},
1330+
"clang-format": {
1331+
"description": "Run Clang-Format source code formatter"
1332+
},
11981333
"clang-rename": {
11991334
"description": "Run Clang-Rename refactoring tool"
12001335
},

‎contrib/libs/apache/arrow/cpp/src/arrow/array/diff.cc

+12-10
Original file line numberDiff line numberDiff line change
@@ -629,42 +629,44 @@ class MakeFormatterImpl {
629629
auto fmt = fmt_str.c_str();
630630
auto unit = checked_cast<const T&>(*array.type()).unit();
631631
auto value = checked_cast<const NumericArray<T>&>(array).Value(index);
632-
using arrow_vendored::date::format;
632+
// Using unqualified `format` directly would produce ambiguous
633+
// lookup because of `std::format` (ARROW-15520).
634+
namespace avd = arrow_vendored::date;
633635
using std::chrono::nanoseconds;
634636
using std::chrono::microseconds;
635637
using std::chrono::milliseconds;
636638
using std::chrono::seconds;
637639
if (AddEpoch) {
638-
static arrow_vendored::date::sys_days epoch{arrow_vendored::date::jan / 1 / 1970};
640+
static avd::sys_days epoch{avd::jan / 1 / 1970};
639641

640642
switch (unit) {
641643
case TimeUnit::NANO:
642-
*os << format(fmt, static_cast<nanoseconds>(value) + epoch);
644+
*os << avd::format(fmt, static_cast<nanoseconds>(value) + epoch);
643645
break;
644646
case TimeUnit::MICRO:
645-
*os << format(fmt, static_cast<microseconds>(value) + epoch);
647+
*os << avd::format(fmt, static_cast<microseconds>(value) + epoch);
646648
break;
647649
case TimeUnit::MILLI:
648-
*os << format(fmt, static_cast<milliseconds>(value) + epoch);
650+
*os << avd::format(fmt, static_cast<milliseconds>(value) + epoch);
649651
break;
650652
case TimeUnit::SECOND:
651-
*os << format(fmt, static_cast<seconds>(value) + epoch);
653+
*os << avd::format(fmt, static_cast<seconds>(value) + epoch);
652654
break;
653655
}
654656
return;
655657
}
656658
switch (unit) {
657659
case TimeUnit::NANO:
658-
*os << format(fmt, static_cast<nanoseconds>(value));
660+
*os << avd::format(fmt, static_cast<nanoseconds>(value));
659661
break;
660662
case TimeUnit::MICRO:
661-
*os << format(fmt, static_cast<microseconds>(value));
663+
*os << avd::format(fmt, static_cast<microseconds>(value));
662664
break;
663665
case TimeUnit::MILLI:
664-
*os << format(fmt, static_cast<milliseconds>(value));
666+
*os << avd::format(fmt, static_cast<milliseconds>(value));
665667
break;
666668
case TimeUnit::SECOND:
667-
*os << format(fmt, static_cast<seconds>(value));
669+
*os << avd::format(fmt, static_cast<seconds>(value));
668670
break;
669671
}
670672
};

0 commit comments

Comments
 (0)