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 450577 879fa39a3f5a7390fa5a2d19137c3c951a405b39
parent 450576 a8d61a880677b938917273ed3f2aea8798ed51b9
child 450578 beb58228e1a555ca84198d75bbe058943f1ede87
push id272
push usereakhgari@mozilla.com
push dateThu, 13 Dec 2018 22:29:46 +0000
treeherdermozilla-esr60@ff97c7a84632 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssylvestre
bugs1508255
milestone60.4.1
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,21 +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