Fixed pre-commit.ci related stuff

Signed-off-by: TaikiYamada4 <[email protected]>
autowarefoundation · Sep 30, 2024 · 147ba6a · 147ba6a
1 parent f9a16da
commit 147ba6a
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 62 deletions.
diff --git a/map/autoware_lanelet2_map_validator/src/main.cpp b/map/autoware_lanelet2_map_validator/src/main.cpp
@@ -143,8 +143,8 @@ int main(int argc, char * argv[])
 
   // Print available validators
   if (config.command_line_config.print) {
-    auto checks = lanelet::validation::availabeChecks(
-      config.command_line_config.validationConfig.checksFilter);  // cspell:disable-line
+    auto checks = lanelet::validation::availabeChecks(  // cspell:disable-line
+      config.command_line_config.validationConfig.checksFilter);
     if (checks.empty()) {
       std::cout << "No checks found matching '"
                 << config.command_line_config.validationConfig.checksFilter << "'\n";

diff --git a/...et2_map_validator/src/validators/crosswalk/missing_regulatory_elements_for_crosswalks.hpp b/...et2_map_validator/src/validators/crosswalk/missing_regulatory_elements_for_crosswalks.hpp
@@ -12,15 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-<<<<<<< HEAD:map/autoware_lanelet2_map_validator/include/autoware_lanelet2_map_validator/validators/crosswalk/missing_regulatory_elements_for_crosswalks.hpp
 #ifndef VALIDATORS__CROSSWALK__MISSING_REGULATORY_ELEMENTS_FOR_CROSSWALKS_HPP_
-MISSING_REGULATORY_ELEMENTS_FOR_CROSSWALKS_HPP_
 #define VALIDATORS__CROSSWALK__MISSING_REGULATORY_ELEMENTS_FOR_CROSSWALKS_HPP_
-MISSING_REGULATORY_ELEMENTS_FOR_CROSSWALKS_HPP_
-=======
-#ifndef VALIDATORS__CROSSWALK__MISSING_REGULATORY_ELEMENTS_FOR_CROSSWALKS_HPP_
-#define VALIDATORS__CROSSWALK__MISSING_REGULATORY_ELEMENTS_FOR_CROSSWALKS_HPP_
->>>>>>> 0fe0b37 (Changed the entire structure.):map/autoware_lanelet2_map_validator/src/validators/crosswalk/missing_regulatory_elements_for_crosswalks.hpp
 
 #include <lanelet2_validation/Validation.h>
 #include <lanelet2_validation/ValidatorFactory.h>
@@ -43,9 +36,4 @@ class MissingRegulatoryElementsForCrosswalksValidator : public lanelet::validati
 }  // namespace validation
 }  // namespace lanelet
 
-<<<<<<< HEAD:map/autoware_lanelet2_map_validator/include/autoware_lanelet2_map_validator/validators/crosswalk/missing_regulatory_elements_for_crosswalks.hpp
-#endif  // AUTOWARE_LANELET2_MAP_VALIDATOR__VALIDATORS__CROSSWALK__MISSING_REGULATORY_ELEMENTS_FOR_CROSSWALKS_HPP_
-        // MISSING_REGULATORY_ELEMENTS_FOR_CROSSWALKS_HPP_
-=======
 #endif  // VALIDATORS__CROSSWALK__MISSING_REGULATORY_ELEMENTS_FOR_CROSSWALKS_HPP_
->>>>>>> 0fe0b37 (Changed the entire structure.):map/autoware_lanelet2_map_validator/src/validators/crosswalk/missing_regulatory_elements_for_crosswalks.hpp
diff --git a/...let2_map_validator/src/validators/crosswalk/regulatory_element_details_for_crosswalks.hpp b/...let2_map_validator/src/validators/crosswalk/regulatory_element_details_for_crosswalks.hpp
@@ -12,15 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-<<<<<<< HEAD:map/autoware_lanelet2_map_validator/include/autoware_lanelet2_map_validator/validators/crosswalk/regulatory_element_details_for_crosswalks.hpp
 #ifndef VALIDATORS__CROSSWALK__REGULATORY_ELEMENT_DETAILS_FOR_CROSSWALKS_HPP_
-REGULATORY_ELEMENT_DETAILS_FOR_CROSSWALKS_HPP_
 #define VALIDATORS__CROSSWALK__REGULATORY_ELEMENT_DETAILS_FOR_CROSSWALKS_HPP_
-REGULATORY_ELEMENT_DETAILS_FOR_CROSSWALKS_HPP_
-=======
-#ifndef VALIDATORS__CROSSWALK__REGULATORY_ELEMENT_DETAILS_FOR_CROSSWALKS_HPP_
-#define VALIDATORS__CROSSWALK__REGULATORY_ELEMENT_DETAILS_FOR_CROSSWALKS_HPP_
->>>>>>> 0fe0b37 (Changed the entire structure.):map/autoware_lanelet2_map_validator/src/validators/crosswalk/regulatory_element_details_for_crosswalks.hpp
 
 #include <lanelet2_validation/Validation.h>
 #include <lanelet2_validation/ValidatorFactory.h>
@@ -43,9 +36,4 @@ class RegulatoryElementsDetailsForCrosswalksValidator : public lanelet::validati
 }  // namespace validation
 }  // namespace lanelet
 
-<<<<<<< HEAD:map/autoware_lanelet2_map_validator/include/autoware_lanelet2_map_validator/validators/crosswalk/regulatory_element_details_for_crosswalks.hpp
-#endif  // AUTOWARE_LANELET2_MAP_VALIDATOR__VALIDATORS__CROSSWALK__REGULATORY_ELEMENT_DETAILS_FOR_CROSSWALKS_HPP_
-        // REGULATORY_ELEMENT_DETAILS_FOR_CROSSWALKS_HPP_
-=======
 #endif  // VALIDATORS__CROSSWALK__REGULATORY_ELEMENT_DETAILS_FOR_CROSSWALKS_HPP_
->>>>>>> 0fe0b37 (Changed the entire structure.):map/autoware_lanelet2_map_validator/src/validators/crosswalk/regulatory_element_details_for_crosswalks.hpp
diff --git a/...et2_map_validator/src/validators/stop_line/missing_regulatory_elements_for_stop_lines.hpp b/...et2_map_validator/src/validators/stop_line/missing_regulatory_elements_for_stop_lines.hpp
@@ -12,15 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-<<<<<<< HEAD:map/autoware_lanelet2_map_validator/include/autoware_lanelet2_map_validator/validators/stop_line/missing_regulatory_elements_for_stop_lines.hpp
 #ifndef VALIDATORS__STOP_LINE__MISSING_REGULATORY_ELEMENTS_FOR_STOP_LINES_HPP_
-MISSING_REGULATORY_ELEMENTS_FOR_STOP_LINES_HPP_
 #define VALIDATORS__STOP_LINE__MISSING_REGULATORY_ELEMENTS_FOR_STOP_LINES_HPP_
-MISSING_REGULATORY_ELEMENTS_FOR_STOP_LINES_HPP_
-=======
-#ifndef VALIDATORS__STOP_LINE__MISSING_REGULATORY_ELEMENTS_FOR_STOP_LINES_HPP_
-#define VALIDATORS__STOP_LINE__MISSING_REGULATORY_ELEMENTS_FOR_STOP_LINES_HPP_
->>>>>>> 0fe0b37 (Changed the entire structure.):map/autoware_lanelet2_map_validator/src/validators/stop_line/missing_regulatory_elements_for_stop_lines.hpp
 
 #include <lanelet2_validation/Validation.h>
 #include <lanelet2_validation/ValidatorFactory.h>
@@ -43,9 +36,4 @@ class MissingRegulatoryElementsForStopLinesValidator : public lanelet::validatio
 }  // namespace validation
 }  // namespace lanelet
 
-<<<<<<< HEAD:map/autoware_lanelet2_map_validator/include/autoware_lanelet2_map_validator/validators/stop_line/missing_regulatory_elements_for_stop_lines.hpp
-#endif  // AUTOWARE_LANELET2_MAP_VALIDATOR__VALIDATORS__STOP_LINE__MISSING_REGULATORY_ELEMENTS_FOR_STOP_LINES_HPP_
-        // MISSING_REGULATORY_ELEMENTS_FOR_STOP_LINES_HPP_
-=======
 #endif  // VALIDATORS__STOP_LINE__MISSING_REGULATORY_ELEMENTS_FOR_STOP_LINES_HPP_
->>>>>>> 0fe0b37 (Changed the entire structure.):map/autoware_lanelet2_map_validator/src/validators/stop_line/missing_regulatory_elements_for_stop_lines.hpp
diff --git a/...validator/src/validators/traffic_light/missing_regulatory_elements_for_traffic_lights.hpp b/...validator/src/validators/traffic_light/missing_regulatory_elements_for_traffic_lights.hpp
@@ -12,15 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-<<<<<<< HEAD:map/autoware_lanelet2_map_validator/include/autoware_lanelet2_map_validator/validators/traffic_light/missing_regulatory_elements_for_traffic_lights.hpp
 #ifndef VALIDATORS__TRAFFIC_LIGHT__MISSING_REGULATORY_ELEMENTS_FOR_TRAFFIC_LIGHTS_HPP_
-MISSING_REGULATORY_ELEMENTS_FOR_TRAFFIC_LIGHTS_HPP_
 #define VALIDATORS__TRAFFIC_LIGHT__MISSING_REGULATORY_ELEMENTS_FOR_TRAFFIC_LIGHTS_HPP_
-MISSING_REGULATORY_ELEMENTS_FOR_TRAFFIC_LIGHTS_HPP_
-=======
-#ifndef VALIDATORS__TRAFFIC_LIGHT__MISSING_REGULATORY_ELEMENTS_FOR_TRAFFIC_LIGHTS_HPP_
-#define VALIDATORS__TRAFFIC_LIGHT__MISSING_REGULATORY_ELEMENTS_FOR_TRAFFIC_LIGHTS_HPP_
->>>>>>> 0fe0b37 (Changed the entire structure.):map/autoware_lanelet2_map_validator/src/validators/traffic_light/missing_regulatory_elements_for_traffic_lights.hpp
 
 #include <lanelet2_validation/Validation.h>
 #include <lanelet2_validation/ValidatorFactory.h>
@@ -46,9 +39,4 @@ class MissingRegulatoryElementsForTrafficLightsValidator : public lanelet::valid
 }  // namespace validation
 }  // namespace lanelet
 
-<<<<<<< HEAD:map/autoware_lanelet2_map_validator/include/autoware_lanelet2_map_validator/validators/traffic_light/missing_regulatory_elements_for_traffic_lights.hpp
-#endif  // AUTOWARE_LANELET2_MAP_VALIDATOR__VALIDATORS__TRAFFIC_LIGHT__MISSING_REGULATORY_ELEMENTS_FOR_TRAFFIC_LIGHTS_HPP_
-        // MISSING_REGULATORY_ELEMENTS_FOR_TRAFFIC_LIGHTS_HPP_
-=======
 #endif  // VALIDATORS__TRAFFIC_LIGHT__MISSING_REGULATORY_ELEMENTS_FOR_TRAFFIC_LIGHTS_HPP_
->>>>>>> 0fe0b37 (Changed the entire structure.):map/autoware_lanelet2_map_validator/src/validators/traffic_light/missing_regulatory_elements_for_traffic_lights.hpp
diff --git a/..._validator/src/validators/traffic_light/regulatory_element_details_for_traffic_lights.hpp b/..._validator/src/validators/traffic_light/regulatory_element_details_for_traffic_lights.hpp
@@ -12,15 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-<<<<<<< HEAD:map/autoware_lanelet2_map_validator/include/autoware_lanelet2_map_validator/validators/traffic_light/regulatory_element_details_for_traffic_lights.hpp
 #ifndef VALIDATORS__TRAFFIC_LIGHT__REGULATORY_ELEMENT_DETAILS_FOR_TRAFFIC_LIGHTS_HPP_
-REGULATORY_ELEMENT_DETAILS_FOR_TRAFFIC_LIGHTS_HPP_
 #define VALIDATORS__TRAFFIC_LIGHT__REGULATORY_ELEMENT_DETAILS_FOR_TRAFFIC_LIGHTS_HPP_
-REGULATORY_ELEMENT_DETAILS_FOR_TRAFFIC_LIGHTS_HPP_
-=======
-#ifndef VALIDATORS__TRAFFIC_LIGHT__REGULATORY_ELEMENT_DETAILS_FOR_TRAFFIC_LIGHTS_HPP_
-#define VALIDATORS__TRAFFIC_LIGHT__REGULATORY_ELEMENT_DETAILS_FOR_TRAFFIC_LIGHTS_HPP_
->>>>>>> 0fe0b37 (Changed the entire structure.):map/autoware_lanelet2_map_validator/src/validators/traffic_light/regulatory_element_details_for_traffic_lights.hpp
 
 #include <lanelet2_validation/Validation.h>
 #include <lanelet2_validation/ValidatorFactory.h>
@@ -50,9 +43,4 @@ class RegulatoryElementsDetailsForTrafficLightsValidator : public lanelet::valid
 }  // namespace validation
 }  // namespace lanelet
 
-<<<<<<< HEAD:map/autoware_lanelet2_map_validator/include/autoware_lanelet2_map_validator/validators/traffic_light/regulatory_element_details_for_traffic_lights.hpp
-#endif  // AUTOWARE_LANELET2_MAP_VALIDATOR__VALIDATORS__TRAFFIC_LIGHT__REGULATORY_ELEMENT_DETAILS_FOR_TRAFFIC_LIGHTS_HPP_
-        // REGULATORY_ELEMENT_DETAILS_FOR_TRAFFIC_LIGHTS_HPP_
-=======
 #endif  // VALIDATORS__TRAFFIC_LIGHT__REGULATORY_ELEMENT_DETAILS_FOR_TRAFFIC_LIGHTS_HPP_
->>>>>>> 0fe0b37 (Changed the entire structure.):map/autoware_lanelet2_map_validator/src/validators/traffic_light/regulatory_element_details_for_traffic_lights.hpp