From 97b58f855f36fda7f1a6b80252321b5ea536c520 Mon Sep 17 00:00:00 2001 From: mosfet80 Date: Sun, 25 Aug 2024 09:26:39 +0200 Subject: [PATCH 1/2] Update libs into .pre-commit-config.yaml Updated libs to last version https://github.com/psf/black/tags https://github.com/pre-commit/pre-commit-hooks/tags https://github.com/pre-commit/mirrors-clang-format/tags --- .pre-commit-config.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 715873b114..3b8d288814 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -49,7 +49,7 @@ exclude: | ) repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: c4a0b883114b00d8d76b479c820ce7950211c99b # frozen: v4.5.0 + rev: 2c9f875913ee60ca25ce70243dc24d5b6415598c # frozen: v4.6.0 hooks: - id: trailing-whitespace - id: end-of-file-fixer @@ -57,11 +57,11 @@ repos: - id: check-added-large-files - id: mixed-line-ending - repo: https://github.com/psf/black - rev: 552baf822992936134cbd31a38f69c8cfe7c0f05 # frozen: 24.3.0 + rev: b965c2a5026f8ba399283ba3e01898b012853c79 # frozen: 24.8.0 hooks: - id: black args: ['--line-length', '100'] - repo: https://github.com/pre-commit/mirrors-clang-format - rev: ea59a72ffc9a1ce6b79b02a8076d031aa7ea7805 # frozen: v15.0.7 + rev: 7d85583be209cb547946c82fbe51f4bc5dd1d017 # frozen: v18.1.8 hooks: - id: clang-format From 09386be6a90d6e8a3c0b848df67013d32be83aef Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sun, 25 Aug 2024 07:29:24 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/Base/Parameter.cpp | 6 ++---- src/Base/StackWalker.cpp | 2 +- src/Mod/Mesh/App/Core/SetOperations.cpp | 16 ++++++++-------- .../EditModeInformationOverlayCoinConverter.cpp | 2 +- src/Mod/Spreadsheet/App/PropertySheet.cpp | 4 +--- src/Tools/ThumbnailProvider/Main.cpp | 3 +-- tests/src/Base/Reader.cpp | 15 +++++++++------ 7 files changed, 23 insertions(+), 25 deletions(-) diff --git a/src/Base/Parameter.cpp b/src/Base/Parameter.cpp index 66f5068cd9..6ce71df9c6 100644 --- a/src/Base/Parameter.cpp +++ b/src/Base/Parameter.cpp @@ -1012,15 +1012,13 @@ void ParameterGrp::SetASCII(const char* Name, const char* sValue) { if (!_pGroupNode) { if (FC_LOG_INSTANCE.isEnabled(FC_LOGLEVEL_LOG)) { - FC_WARN("Setting attribute " - << "FCText:" << Name << " in an orphan group " << _cName); + FC_WARN("Setting attribute " << "FCText:" << Name << " in an orphan group " << _cName); } return; } if (_Clearing) { if (FC_LOG_INSTANCE.isEnabled(FC_LOGLEVEL_LOG)) { - FC_WARN("Adding attribute " - << "FCText:" << Name << " while clearing " << GetPath()); + FC_WARN("Adding attribute " << "FCText:" << Name << " while clearing " << GetPath()); } return; } diff --git a/src/Base/StackWalker.cpp b/src/Base/StackWalker.cpp index b65a6d2943..0fb3b982ae 100644 --- a/src/Base/StackWalker.cpp +++ b/src/Base/StackWalker.cpp @@ -230,7 +230,7 @@ typedef DWORD64(__stdcall* PTRANSLATE_ADDRESS_ROUTINE64)(HANDLE hProcess, // Some missing defines (for VC5/6): #ifndef INVALID_FILE_ATTRIBUTES -#define INVALID_FILE_ATTRIBUTES ((DWORD)-1) +#define INVALID_FILE_ATTRIBUTES ((DWORD) - 1) #endif // secure-CRT_functions are only available starting with VC8 diff --git a/src/Mod/Mesh/App/Core/SetOperations.cpp b/src/Mod/Mesh/App/Core/SetOperations.cpp index 064b4409e4..89117aee42 100644 --- a/src/Mod/Mesh/App/Core/SetOperations.cpp +++ b/src/Mod/Mesh/App/Core/SetOperations.cpp @@ -281,13 +281,13 @@ void SetOperations::Cut(std::set& facetsCuttingEdge0, } } // if (f1.IntersectWithFacet(f2, p0, p1)) - } // for (it2 = vecFacets2.begin(); it2 != vecFacets2.end(); ++it2) - } // for (it1 = vecFacets1.begin(); it1 != vecFacets1.end(); ++it1) - } // if (vecFacets2.size() > 0) - } // if (grid1.GetCtElements(gx1, gy1, gz1) > 0) - } // for (gz1 = 0; gz1 < ctGz1; gz1++) - } // for (gy1 = 0; gy1 < ctGy1; gy1++) - } // for (gx1 = 0; gx1 < ctGx1; gx1++) + } // for (it2 = vecFacets2.begin(); it2 != vecFacets2.end(); ++it2) + } // for (it1 = vecFacets1.begin(); it1 != vecFacets1.end(); ++it1) + } // if (vecFacets2.size() > 0) + } // if (grid1.GetCtElements(gx1, gy1, gz1) > 0) + } // for (gz1 = 0; gz1 < ctGz1; gz1++) + } // for (gy1 = 0; gy1 < ctGy1; gy1++) + } // for (gx1 = 0; gx1 < ctGx1; gx1++) } void SetOperations::TriangulateMesh(const MeshKernel& cutMesh, int side) @@ -416,7 +416,7 @@ void SetOperations::TriangulateMesh(const MeshKernel& cutMesh, int side) _newMeshFacets[side].push_back(facet); } // for (i = 0; i < (out->numberoftriangles * 3); i += 3) - } // for (it1 = _facet2points[side].begin(); it1 != _facet2points[side].end(); ++it1) + } // for (it1 = _facet2points[side].begin(); it1 != _facet2points[side].end(); ++it1) } void SetOperations::CollectFacets(int side, float mult) diff --git a/src/Mod/Sketcher/Gui/EditModeInformationOverlayCoinConverter.cpp b/src/Mod/Sketcher/Gui/EditModeInformationOverlayCoinConverter.cpp index e3c53f32c4..37b475b7e6 100644 --- a/src/Mod/Sketcher/Gui/EditModeInformationOverlayCoinConverter.cpp +++ b/src/Mod/Sketcher/Gui/EditModeInformationOverlayCoinConverter.cpp @@ -55,7 +55,7 @@ EditModeInformationOverlayCoinConverter::EditModeInformationOverlayCoinConverter , drawingParameters(drawingparameters) , nodeId(0) { - }; + }; void EditModeInformationOverlayCoinConverter::convert(const Part::Geometry* geometry, int geoid) { diff --git a/src/Mod/Spreadsheet/App/PropertySheet.cpp b/src/Mod/Spreadsheet/App/PropertySheet.cpp index 9c6bc8b045..652185cf14 100644 --- a/src/Mod/Spreadsheet/App/PropertySheet.cpp +++ b/src/Mod/Spreadsheet/App/PropertySheet.cpp @@ -2251,9 +2251,7 @@ void PropertySheet::setPathValue(const ObjectIdentifier& path, const boost::any& } } - FC_THROWM(Base::TypeError, - "Invalid path value '" - << "' for " << getFullName()); + FC_THROWM(Base::TypeError, "Invalid path value '" << "' for " << getFullName()); } const boost::any PropertySheet::getPathValue(const App::ObjectIdentifier& path) const diff --git a/src/Tools/ThumbnailProvider/Main.cpp b/src/Tools/ThumbnailProvider/Main.cpp index dd5c695fe1..3c6f03c275 100644 --- a/src/Tools/ThumbnailProvider/Main.cpp +++ b/src/Tools/ThumbnailProvider/Main.cpp @@ -132,8 +132,7 @@ STDAPI DllRegisterServer() L".FCBak\\shellex\\{E357FCCD-A995-4576-B01F-234630154E96}", NULL, REG_SZ, - (DWORD_PTR)szCLSID_SampleThumbnailProvider} - }; + (DWORD_PTR)szCLSID_SampleThumbnailProvider}}; return CreateRegistryKeys(keys, ARRAYSIZE(keys)); } diff --git a/tests/src/Base/Reader.cpp b/tests/src/Base/Reader.cpp index 6180d81084..c662fa608a 100644 --- a/tests/src/Base/Reader.cpp +++ b/tests/src/Base/Reader.cpp @@ -331,10 +331,13 @@ TEST_F(ReaderTest, invalidDefaults) givenDataAsXMLStream(xmlBody); // Act / Assert - EXPECT_THROW({ Reader()->getAttributeAsInteger("missing", "Not an Integer"); }, - std::invalid_argument); - EXPECT_THROW({ Reader()->getAttributeAsInteger("missing", "Not an Unsigned"); }, - std::invalid_argument); - EXPECT_THROW({ Reader()->getAttributeAsInteger("missing", "Not a Float"); }, - std::invalid_argument); + EXPECT_THROW( + { Reader()->getAttributeAsInteger("missing", "Not an Integer"); }, + std::invalid_argument); + EXPECT_THROW( + { Reader()->getAttributeAsInteger("missing", "Not an Unsigned"); }, + std::invalid_argument); + EXPECT_THROW( + { Reader()->getAttributeAsInteger("missing", "Not a Float"); }, + std::invalid_argument); }