Bug 1413609 - Remove Mozilla specific options as they have been merged upstream r=andi
authorSylvestre Ledru <sledru@mozilla.com>
Mon, 06 Nov 2017 10:06:31 +0100
changeset 441111 f43442328ed98b47cdc1eddd14c064c9f6344ea5
parent 441110 5915590f95004274e58c98e00d3df90ec209422c
child 441112 a94bd2a1b543403beb8c94f7cb0d166cc4a21583
push id8127
push userryanvm@gmail.com
push dateTue, 07 Nov 2017 22:38:50 +0000
treeherdermozilla-beta@692b6712f560 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersandi
bugs1413609
milestone58.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 1413609 - Remove Mozilla specific options as they have been merged upstream r=andi MozReview-Commit-ID: EUF8lobk4n3
.clang-format
--- a/.clang-format
+++ b/.clang-format
@@ -1,17 +1,13 @@
 BasedOnStyle: Mozilla
 
 # Ignore all comments because they aren't reflowed properly.
 CommentPragmas: "^"
 
-# Force pointers to the type for C++.
-DerivePointerAlignment: false
-PointerAlignment: Left
-
 # Prevent the loss of indentation with these macros
 MacroBlockBegin: "^\
 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|\
@@ -23,22 +19,16 @@ 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
 
 
-# All of the following items are default
-# in the Mozila coding style from clang format 4.0
-AlwaysBreakAfterReturnType: TopLevel
-BinPackArguments: false
-BinPackParameters: false
-SpaceAfterTemplateKeyword: false
 ReflowComments: false
 
 
 BreakBeforeBraces: Custom
 BraceWrapping:
   AfterEnum: true
   AfterStruct: true
   AfterFunction: true