Clippy fix and add CI workflows

melodyoncode · melodyoncode · commit c49ca51bf3a7 · 2026-06-11T10:46:34.000+08:00
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -57,3 +57,9 @@ jobs:
       - name: Ensure correct dependency resolution
         run: |
           bazel mod deps --lockfile_mode=update
+      - name: Run Libclang Parser Tooling clippy
+        run: |
+          bazel build //cpp/libclang/... --config=clippy
+      - name: Run Libclang Parser Tooling tests
+        run: |
+          bazel test //cpp/libclang/...
diff --git a/cpp/libclang/README.md b/cpp/libclang/README.md
@@ -1,3 +1,16 @@
+<!-- ----------------------------------------------------------------------------
+  Copyright (c) 2026 Contributors to the Eclipse Foundation
+
+  See the NOTICE file(s) distributed with this work for additional
+  information regarding copyright ownership.
+
+  This program and the accompanying materials are made available under the
+  terms of the Apache License Version 2.0 which is available at
+  https://www.apache.org/licenses/LICENSE-2.0
+
+  SPDX-License-Identifier: Apache-2.0
+----------------------------------------------------------------------------- -->
+
 # Run C++ parser targets
 
 ## Configure a parser target in `BUILD`
diff --git a/cpp/libclang/integration_test/README.md b/cpp/libclang/integration_test/README.md
@@ -1,3 +1,16 @@
+<!-- ----------------------------------------------------------------------------
+  Copyright (c) 2026 Contributors to the Eclipse Foundation
+
+  See the NOTICE file(s) distributed with this work for additional
+  information regarding copyright ownership.
+
+  This program and the accompanying materials are made available under the
+  terms of the Apache License Version 2.0 which is available at
+  https://www.apache.org/licenses/LICENSE-2.0
+
+  SPDX-License-Identifier: Apache-2.0
+----------------------------------------------------------------------------- -->
+
 # libclang Integration Tests
 
 This directory contains integration tests for the C++ libclang parser and related tooling.
diff --git a/cpp/libclang/src/main.rs b/cpp/libclang/src/main.rs
@@ -49,7 +49,7 @@ struct Args {
 
 fn parse_file(
     file: &PathBuf,
-    compilation_flags: &Vec<String>,
+    compilation_flags: &[String],
     index: &clang::Index,
     ast_file_output_path: &PathBuf,
     all_classes: &mut BTreeMap<String, context::TypeMapValue>,
@@ -64,7 +64,7 @@ fn parse_file(
         }
     };
 
-    let parse_result = index.parser(&file).arguments(&compilation_flags).parse();
+    let parse_result = index.parser(file).arguments(compilation_flags).parse();
 
     match parse_result {
         Ok(parsed) => {
@@ -76,7 +76,7 @@ fn parse_file(
             }
 
             let entity = parsed.get_entity();
-            print_entity(&entity, 0, PrintMode::File(&ast_file_output_path));
+            print_entity(&entity, 0, PrintMode::File(ast_file_output_path));
             print_entity(&entity, 0, PrintMode::Stdout);
 
             let mut ctx = VisitContext::default();
@@ -139,8 +139,8 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         let compilation_flags = &command_line_args.extra_args;
 
         parse_file(
-            &file,
-            &compilation_flags,
+            file,
+            compilation_flags,
             &index,
             &ast_file_output_path,
             &mut all_classes,
diff --git a/cpp/libclang/src/visitor/src/class_parser_helper.rs b/cpp/libclang/src/visitor/src/class_parser_helper.rs
@@ -10,6 +10,8 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 ////////////////////////////////////////////////////////////////////////////////////
+#![cfg_attr(test, allow(dead_code))]
+
 use clang::{Entity, EntityKind, Type, TypeKind};
 use serde::{Deserialize, Serialize};
 
@@ -450,7 +452,7 @@ fn resolve_unqualified_type(original: &Type, canonical: &Type) -> ResolvedType {
 
             ResolvedType::Array {
                 element: Box::new(element),
-                size: original.get_size().map(|s| s as usize),
+                size: original.get_size(),
             }
         }
 
@@ -624,7 +626,7 @@ fn build_fqn_from_entity(entity: &Entity) -> String {
     // Traversal is semantic (not lexical) so aliases/nested constructs resolve to
     // stable ownership hierarchy used by relationship and id matching.
     let mut parts: Vec<(String, bool)> = Vec::new();
-    let mut current = Some(entity.clone());
+    let mut current = Some(*entity);
 
     while let Some(entity) = current {
         match entity.get_kind() {
diff --git a/cpp/libclang/src/visitor/src/class_visitor.rs b/cpp/libclang/src/visitor/src/class_visitor.rs
@@ -74,7 +74,7 @@ impl ClassVisitor {
         };
 
         let mut class_entity = SimpleEntity {
-            id: id,
+            id,
             name: name.clone(),
             enclosing_namespace_id: namespace.map(|ns| ns.to_string()),
             ..Default::default()
@@ -153,12 +153,8 @@ fn parse_source_location(entity: &Entity) -> (Option<String>, Option<u32>) {
 }
 
 fn collect_variable_type(entity: &Entity) -> Option<ParsedVariableType> {
-    let Some(name) = entity.get_name() else {
-        return None;
-    };
-    let Some(field_type) = entity.get_type() else {
-        return None;
-    };
+    let name = entity.get_name()?;
+    let field_type = entity.get_type()?;
 
     Some(ParsedVariableType {
         name,
diff --git a/cpp/libclang/src/visitor/src/enum_visitor.rs b/cpp/libclang/src/visitor/src/enum_visitor.rs
@@ -36,7 +36,7 @@ impl EnumVisitor {
         };
         Some(SimpleEntity {
             id: full_qualified_id,
-            name: name,
+            name,
             enclosing_namespace_id: namespace_id,
             entity_type: EntityType::Enum,
             enum_literals: get_literals(entity),
diff --git a/plantuml/parser/puml_serializer/src/serialize/sequence_serializer.rs b/plantuml/parser/puml_serializer/src/serialize/sequence_serializer.rs
@@ -13,7 +13,7 @@
 
 use flatbuffers::FlatBufferBuilder;
 use sequence_fbs::sequence_metamodel as fb;
-use sequence_logic::{ConditionType, Event, SequenceNode, SequenceTree};
+use sequence_diagram::{ConditionType, Event, SequenceNode, SequenceTree};
 
 pub struct SequenceSerializer;
 
diff --git a/third_party/libclang/patchv1.8.2.patch b/third_party/libclang/patchv1.8.2.patch
@@ -1,3 +1,16 @@
+# *******************************************************************************
+# Copyright (c) 2026 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Apache License Version 2.0 which is available at
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# SPDX-License-Identifier: Apache-2.0
+# *******************************************************************************
+
 diff --git a/CHANGELOG.md b/CHANGELOG.md
 index 169ae2d..dd3548f 100644
 --- a/CHANGELOG.md
@@ -14,17 +27,17 @@ index 169ae2d..dd3548f 100644
 +when using target-prefixed `clang` binaries
 +
  ## [1.8.1] - 2024-05-28
- 
+
  ### Added
 @@ -20,8 +30,6 @@
  ### Fixed
  - Fixed handling of paths that contain characters that have special meaning in
  glob patterns (e.g., `[` or `]`)
 -- Fixed `Clang::find` to support both the `-target` and `--target` arguments
 -when using target-prefixed `clang` binaries
- 
+
  ## [1.7.0] - 2023-12-31
- 
+
 diff --git a/build/common.rs b/build/common.rs
 index 696d923..6653478 100644
 --- a/build/common.rs
@@ -43,7 +56,7 @@ index d24490f..87e32cc 100644
 +++ b/build/dynamic.rs
 @@ -263,8 +263,8 @@ pub fn link() {
          let name = filename.trim_start_matches("lib");
- 
+
          // Strip extensions and trailing version numbers (e.g., the `.so.7.0` in
 -        // `libclang.so.7.0`).
 -        let name = match name.find(".dylib").or_else(|| name.find(".so")) {
@@ -66,7 +79,7 @@ index 58e64b5..87f94ba 100644
 +            pub(crate) path: PathBuf,
              pub functions: Functions,
          }
- 
+
 diff --git a/src/support.rs b/src/support.rs
 index 51764d2..2d28b1c 100644
 --- a/src/support.rs
@@ -91,7 +104,7 @@ index 51764d2..2d28b1c 100644
      /// ## Cross-compilation
      ///
 @@ -70,7 +72,7 @@ impl Clang {
- 
+
          let mut target = None;
          for i in 0..args.len() {
 -            if (args[i] == "-target" || args[i] == "-target") && i + 1 < args.len() {
@@ -102,7 +115,7 @@ index 51764d2..2d28b1c 100644
 @@ -83,6 +85,16 @@ impl Clang {
              paths.push(path.into());
          }
- 
+
 +        #[cfg(feature = "runtime")]
 +        if let Some(library) = crate::get_library() {
 +            if let Some(directory) = library.path().parent() {
diff --git a/third_party/libclang/patchv1.9.0.patch b/third_party/libclang/patchv1.9.0.patch
@@ -1,3 +1,16 @@
+# *******************************************************************************
+# Copyright (c) 2026 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Apache License Version 2.0 which is available at
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# SPDX-License-Identifier: Apache-2.0
+# *******************************************************************************
+
 diff --git a/CHANGELOG.md b/CHANGELOG.md
 index dd3548f..e512edf 100644
 --- a/CHANGELOG.md
@@ -9,14 +22,14 @@ index dd3548f..e512edf 100644
 +- Added `--link-static` flag when listing static libraries to link to
 +
  ## [1.8.2] - 2024-05-29
- 
+
  ### Changed
 diff --git a/build/static.rs b/build/static.rs
 index 6bc2bea..e835178 100644
 --- a/build/static.rs
 +++ b/build/static.rs
 @@ -41,7 +41,7 @@ fn get_library_name(path: &Path) -> Option<String> {
- 
+
  /// Gets the LLVM static libraries required to link to `libclang`.
  fn get_llvm_libraries() -> Vec<String> {
 -    common::run_llvm_config(&["--libs"])
