Fix linking with newer rust versions.

.github/workflows/python.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Install latest rust toolchain
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.60.0
+          toolchain: 1.63.0
           override: true
 
       - name: install python dependencies

Cargo.toml

@@ -1,11 +1,12 @@
 [package]
 name = "weggli"
-version = "0.2.4"
+version = "0.2.5"
 authors = ["fwilhelm"]
 edition = "2018"
 license = "Apache-2.0"
 description = "weggli is a fast and robust semantic search tool for C and C++ codebases. It is designed to help security researchers identify interesting functionality in large codebases."
-
+repository = "https://github.com/weggli-rs/weggli"
+rust-version = "1.63.0"
 
 [features]
 python = ["pyo3"]
@@ -38,10 +39,10 @@ optional = true
 nix = "0.25.0"
 
 [build-dependencies]
-cc = "1.0.73"
+cc = "1.0.83"
 
 [dev-dependencies]
-criterion = {version = "0.3",features = ["html_reports"]}
+criterion = { version = "0.3", features = ["html_reports"] }
 assert_cmd = "2.0.0"
 predicates = "1"
 

README.md

@@ -26,7 +26,7 @@ weggli is inspired by great tools like [Semgrep](https://semgrep.dev/), [Coccine
 ```
 Use -h for short descriptions and --help for more details.
 
- Homepage: https://github.com/googleprojectzero/weggli
+ Homepage: https://github.com/weggli-rs/weggli
 
  USAGE: weggli [OPTIONS] <PATTERN> <PATH>
 

build.rs

@@ -28,6 +28,10 @@ fn main() {
         .cpp(true)
         .include("third_party/grammars/")
         .file("third_party/grammars/weggli-cpp/src/scanner.cc")
+        // keep all symbols until linking (https://doc.rust-lang.org/rustc/command-line-arguments.html#linking-modifiers-whole-archive)
+        .link_lib_modifier("+whole-archive")
+        // don't bundle into rlib, but link to the object files instead (+bundle is incompatible with +whole-archive) (https://doc.rust-lang.org/rustc/command-line-arguments.html#linking-modifiers-bundle)
+        .link_lib_modifier("-bundle")
         .flag("-w")
         .compile("tree-sitter-cpp-scanner");
 

plugins/binaryninja/requirements.txt

@@ -1,4 +1,4 @@
 setuptools
 wheel
 setuptools-rust
-git+https://github.com/googleprojectzero/weggli@main#egg=weggli
+git+https://github.com/weggli-rs/weggli@main#egg=weggli

setup.py

@@ -3,9 +3,11 @@
 
 setup(
     name="weggli",
-    version="0.2.4",
+    version="0.2.5",
     author="fwilhelm",
-    url="https://github.com/googleprojectzero/weggli",
-    rust_extensions=[RustExtension("weggli", binding=Binding.PyO3, features=["python"])],
+    url="https://github.com/weggli-rs/weggli",
+    rust_extensions=[
+        RustExtension("weggli", binding=Binding.PyO3, features=["python"])
+    ],
     zip_safe=False,
 )

src/cli.rs

@@ -32,7 +32,7 @@ pub struct Args {
     pub force_query: bool,
     pub include: Vec<String>,
     pub exclude: Vec<String>,
-    pub enable_line_numbers: bool
+    pub enable_line_numbers: bool,
 }
 
 /// Parse command arguments and return them inside the Args structure.
@@ -256,7 +256,7 @@ pub fn parse_arguments() -> Args {
         force_query,
         include,
         exclude,
-        enable_line_numbers
+        enable_line_numbers,
     }
 }
 
@@ -267,7 +267,7 @@ mod help {
 
  Use -h for short descriptions and --help for more details.
 
- Homepage: https://github.com/googleprojectzero/weggli";
+ Homepage: https://github.com/weggli-rs/weggli";
 
     pub const TEMPLATE: &str = "\
  {bin} {version}