From ccb3b4307021b01f11834f82d855146b511cd71f Mon Sep 17 00:00:00 2001 From: Seth Bromberger Date: Sun, 8 Mar 2026 19:58:10 +0000 Subject: [PATCH] bump faker and clippy versions --- .clang-format | 89 ++------------------------------- .devcontainer/devcontainer.json | 13 +++-- CMakeLists.txt | 6 +-- 3 files changed, 17 insertions(+), 91 deletions(-) diff --git a/.clang-format b/.clang-format index 6d0f5e9..9d3d060 100644 --- a/.clang-format +++ b/.clang-format @@ -1,95 +1,14 @@ --- -Language: Cpp -# BasedOnStyle: Google -AccessModifierOffset: -1 -AlignAfterOpenBracket: Align -AlignConsecutiveAssignments: true +Language: Cpp +BasedOnStyle: Google AlignConsecutiveDeclarations: true -AlignEscapedNewlinesLeft: true -AlignOperands: true -AlignTrailingComments: true -AllowAllParametersOfDeclarationOnNextLine: true -AllowShortBlocksOnASingleLine: false -AllowShortCaseLabelsOnASingleLine: false AllowShortFunctionsOnASingleLine: All AllowShortIfStatementsOnASingleLine: true AllowShortLoopsOnASingleLine: true -AlwaysBreakAfterDefinitionReturnType: None -AlwaysBreakAfterReturnType: None AlwaysBreakBeforeMultilineStrings: true -AlwaysBreakTemplateDeclarations: true -BinPackArguments: true -BinPackParameters: true -BraceWrapping: - AfterClass: false - AfterControlStatement: false - AfterEnum: false - AfterFunction: false - AfterNamespace: false - AfterObjCDeclaration: false - AfterStruct: false - AfterUnion: false - BeforeCatch: false - BeforeElse: false - IndentBraces: false -BreakBeforeBinaryOperators: None -BreakBeforeBraces: Attach BreakBeforeTernaryOperators: true -BreakConstructorInitializersBeforeComma: false -BreakAfterJavaFieldAnnotations: false -BreakStringLiterals: true -ColumnLimit: 80 -CommentPragmas: '^ IWYU pragma:' ConstructorInitializerAllOnOneLineOrOnePerLine: true -ConstructorInitializerIndentWidth: 4 ContinuationIndentWidth: 2 -Cpp11BracedListStyle: true -DerivePointerAlignment: true -DisableFormat: false -ExperimentalAutoDetectBinPacking: false -ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ] -IncludeCategories: - - Regex: '^<.*\.h>' - Priority: 1 - - Regex: '^<.*' - Priority: 2 - - Regex: '.*' - Priority: 3 -IncludeIsMainRegex: '([-_](test|unittest))?$' IndentCaseLabels: true -IndentWidth: 2 -IndentWrappedFunctionNames: false -JavaScriptQuotes: Leave -JavaScriptWrapImports: true -KeepEmptyLinesAtTheStartOfBlocks: false -MacroBlockBegin: '' -MacroBlockEnd: '' -MaxEmptyLinesToKeep: 1 -NamespaceIndentation: None -ObjCBlockIndentWidth: 2 -ObjCSpaceAfterProperty: false -ObjCSpaceBeforeProtocolList: false -PenaltyBreakBeforeFirstCallParameter: 1 -PenaltyBreakComment: 300 -PenaltyBreakFirstLessLess: 120 -PenaltyBreakString: 1000 -PenaltyExcessCharacter: 1000000 -PenaltyReturnTypeOnItsOwnLine: 200 -PointerAlignment: Left -ReflowComments: true -SortIncludes: false # some header files are sensitive to the include order -SpaceAfterCStyleCast: false -SpaceBeforeAssignmentOperators: true -SpaceBeforeParens: ControlStatements -SpaceInEmptyParentheses: false -SpacesBeforeTrailingComments: 2 -SpacesInAngles: false -SpacesInContainerLiterals: true -SpacesInCStyleCastParentheses: false -SpacesInParentheses: false -SpacesInSquareBrackets: false -Standard: Auto -TabWidth: 8 -UseTab: Never -... - +SortIncludes: false +--- diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index e567e00..bce9369 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -14,10 +14,17 @@ "customizations": { "vscode": { "extensions": [ - "llvm-vs-code-extensions.vscode-clangd", - "streetsidesoftware.code-spell-checker" - ] + "ms-vscode.cmake-tools" + ], + "settings": { + "[cpp]": { + "editor.defaultFormatter": "llvm-vs-code-extensions.vscode-clangd" + }, + "clangd.checkUpdates": true, + "cmake.debugConfig": { "MIMode": "lldb" }, + "cmake.options.statusBarVisibility": "compact" + } } }, "mounts": [ diff --git a/CMakeLists.txt b/CMakeLists.txt index 90dc0cd..0f97258 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,10 +65,10 @@ FetchContent_MakeAvailable(YGM) # # Faker # -set(BUILD_TESTING OFF) +set(FAKER_BUILD_TESTING OFF) FetchContent_Declare(faker GIT_REPOSITORY ${FAKER_FETCH_GIT} - GIT_TAG v4.2.0 + GIT_TAG v4.3.2 GIT_SUBMODULES "" ) FetchContent_MakeAvailable(faker) @@ -81,7 +81,7 @@ set(JSONLOGIC_ENABLE_BENCH OFF) set(JSONLOGIC_ENABLE_TESTS OFF) FetchContent_Declare(CLIPPy GIT_REPOSITORY ${CLIPPY_FETCH_GIT} - GIT_TAG v0.5.1 + GIT_TAG v0.5.3 SOURCE_SUBDIR cpp ) FetchContent_MakeAvailable(CLIPPy)