Repository: trafficserver Updated Branches: refs/heads/master a8e0c5e17 -> 9bc8f0953
Update clang-format style, this is getting close to what we want Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/9bc8f095 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/9bc8f095 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/9bc8f095 Branch: refs/heads/master Commit: 9bc8f095360f2935dcd20db2e7476a0994810469 Parents: a8e0c5e Author: Leif Hedstrom <[email protected]> Authored: Tue Feb 17 20:32:51 2015 -0800 Committer: Leif Hedstrom <[email protected]> Committed: Tue Feb 17 20:32:51 2015 -0800 ---------------------------------------------------------------------- .clang-format | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9bc8f095/.clang-format ---------------------------------------------------------------------- diff --git a/.clang-format b/.clang-format index 15eec01..5251656 100644 --- a/.clang-format +++ b/.clang-format @@ -1,23 +1,24 @@ --- Language: Cpp -# BasedOnStyle: LLVM +# BasedOnStyle: Mozilla AccessModifierOffset: -2 -ConstructorInitializerIndentWidth: 4 -AlignEscapedNewlinesLeft: false +ConstructorInitializerIndentWidth: 2 +AlignEscapedNewlinesLeft: true AlignTrailingComments: true AllowAllParametersOfDeclarationOnNextLine: false AllowShortBlocksOnASingleLine: false AllowShortCaseLabelsOnASingleLine: false AllowShortIfStatementsOnASingleLine: false AllowShortLoopsOnASingleLine: false -AllowShortFunctionsOnASingleLine: All -AlwaysBreakAfterDefinitionReturnType: false +AllowShortFunctionsOnASingleLine: Inline +AlwaysBreakAfterDefinitionReturnType: true AlwaysBreakTemplateDeclarations: false AlwaysBreakBeforeMultilineStrings: false BreakBeforeBinaryOperators: None BreakBeforeTernaryOperators: true BreakConstructorInitializersBeforeComma: false BinPackParameters: true +BinPackArguments: true ColumnLimit: 120 ConstructorInitializerAllOnOneLineOrOnePerLine: false DerivePointerAlignment: false @@ -28,17 +29,17 @@ IndentFunctionDeclarationAfterType: false MaxEmptyLinesToKeep: 2 KeepEmptyLinesAtTheStartOfBlocks: false NamespaceIndentation: None -ObjCSpaceAfterProperty: false -ObjCSpaceBeforeProtocolList: true +ObjCSpaceAfterProperty: true +ObjCSpaceBeforeProtocolList: false PenaltyBreakBeforeFirstCallParameter: 19 PenaltyBreakComment: 300 PenaltyBreakString: 1000 PenaltyBreakFirstLessLess: 120 PenaltyExcessCharacter: 1000000 -PenaltyReturnTypeOnItsOwnLine: 60 +PenaltyReturnTypeOnItsOwnLine: 200 PointerAlignment: Left SpacesBeforeTrailingComments: 1 -Cpp11BracedListStyle: false +Cpp11BracedListStyle: true Standard: Cpp11 IndentWidth: 2 TabWidth: 8
