Bug 1508255 - Merge js/src/.clang-format into top-level r=sylvestre
authorTed Campbell <tcampbell@mozilla.com>
Tue, 20 Nov 2018 12:42:30 +0000
changeset 447331 2d8d64aff05a9af6af00a99c7922b86ad9d1bb55
parent 447330 d437391bafa1ec497443aedac9500cbfa172ec26
child 447332 136188d4f9281e3cec98699de83accbb0ad79439
push id110028
push usershindli@mozilla.com
push dateTue, 20 Nov 2018 21:50:36 +0000
treeherdermozilla-inbound@772005147068 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssylvestre
bugs1508255
milestone65.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1508255 - Merge js/src/.clang-format into top-level r=sylvestre The style options now match, so remove js/src/.clang-format \o/ Depends on D12391 Differential Revision: https://phabricator.services.mozilla.com/D12392
.clang-format
js/src/.clang-format
--- a/.clang-format
+++ b/.clang-format
@@ -1,22 +1,23 @@
 BasedOnStyle: Google
 
 # Prevent the loss of indentation with these macros
 MacroBlockBegin: "^\
+JS_BEGIN_MACRO|\
 NS_INTERFACE_MAP_BEGIN|\
 NS_INTERFACE_TABLE_HEAD|\
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION|\
 NS_IMPL_CYCLE_COLLECTION_.*_BEGIN|\
 NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED|\
 NS_INTERFACE_TABLE_BEGIN|\
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED|\
 NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED$"
 MacroBlockEnd: "^\
+JS_END_MACRO|\
 NS_INTERFACE_MAP_END|\
 NS_IMPL_CYCLE_COLLECTION_.*_END|\
 NS_INTERFACE_TABLE_END|\
 NS_INTERFACE_MAP_END_INHERITING|\
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END_INHERITED|\
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END_INHERITED$"
 
 SortIncludes: false
-
deleted file mode 100644
--- a/js/src/.clang-format
+++ /dev/null
@@ -1,7 +0,0 @@
-BasedOnStyle: Google
-
-# Prevent the loss of indentation with these macros
-MacroBlockBegin: "^JS_BEGIN_MACRO$"
-MacroBlockEnd: "^JS_END_MACRO$"
-
-SortIncludes: false