Fix build and linting (#19)

raviqqe · web-flow · commit 2aa8fdacc8dc · 2025-01-07T14:03:59.000+01:00
This PR fixes build for Linux + Homebrew environment and lining for the
new version of Rust.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -5,6 +5,20 @@ on:
       - master
   pull_request:
 jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-latest
+          - macos-latest
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: swatinem/rust-cache@v2
+      - uses: homebrew/actions/setup-homebrew@master
+      - run: tools/setup.sh
+      - run: cargo build
   test:
     strategy:
       fail-fast: false
@@ -15,16 +29,16 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
-      - uses: Swatinem/rust-cache@v2
-      - uses: Homebrew/actions/setup-homebrew@master
+      - uses: swatinem/rust-cache@v2
+      - uses: homebrew/actions/setup-homebrew@master
       - run: tools/setup.sh
       - run: cargo test
   lint:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: Swatinem/rust-cache@v2
-      - uses: Homebrew/actions/setup-homebrew@master
+      - uses: swatinem/rust-cache@v2
+      - uses: homebrew/actions/setup-homebrew@master
       - run: tools/setup.sh
       - run: cargo clippy -- -D warnings
   format:
diff --git a/build.rs b/build.rs
@@ -1,6 +1,8 @@
 use std::{
     env,
     error::Error,
+    ffi::OsStr,
+    fs::read_dir,
     path::Path,
     process::{exit, Command},
     str,
@@ -18,18 +20,17 @@ const LLVM_MAJOR_VERSION: usize = if cfg!(feature = "llvm16-0") {
 
 fn main() {
     if let Err(error) = run() {
-        eprintln!("{}", error);
+        eprintln!("{error}");
         exit(1);
     }
 }
 
 fn run() -> Result<(), Box<dyn Error>> {
     let version = llvm_config("--version")?;
 
-    if !version.starts_with(&format!("{}.", LLVM_MAJOR_VERSION)) {
+    if !version.starts_with(&format!("{LLVM_MAJOR_VERSION}.")) {
         return Err(format!(
-            "failed to find correct version ({}.x.x) of llvm-config (found {})",
-            LLVM_MAJOR_VERSION, version
+            "failed to find correct version ({LLVM_MAJOR_VERSION}.x.x) of llvm-config (found {version})",
         )
         .into());
     }
@@ -38,6 +39,8 @@ fn run() -> Result<(), Box<dyn Error>> {
     println!("cargo:rerun-if-changed=cc");
     println!("cargo:rustc-link-search={}", llvm_config("--libdir")?);
 
+    build_c_library()?;
+
     for name in llvm_config("--libnames")?.trim().split(' ') {
         println!("cargo:rustc-link-lib=static={}", parse_library_name(name)?);
     }
@@ -62,43 +65,41 @@ fn run() -> Result<(), Box<dyn Error>> {
         }
     }
 
-    println!("cargo:rustc-link-lib=ffi");
-
     if let Some(name) = get_system_libcpp() {
-        println!("cargo:rustc-link-lib={}", name);
+        println!("cargo:rustc-link-lib={name}");
     }
 
-    std::env::set_var("CXXFLAGS", llvm_config("--cxxflags")?);
-    std::env::set_var("CFLAGS", llvm_config("--cflags")?);
-    println!("cargo:rustc-link-search={}", &env::var("OUT_DIR")?);
+    bindgen::builder()
+        .header("wrapper.h")
+        .clang_arg("-Icc/include")
+        .clang_arg(format!("-I{}", llvm_config("--includedir")?))
+        .default_enum_style(bindgen::EnumVariation::ModuleConsts)
+        .parse_callbacks(Box::new(bindgen::CargoCallbacks::new()))
+        .generate()?
+        .write_to_file(Path::new(&env::var("OUT_DIR")?).join("bindings.rs"))?;
+
+    Ok(())
+}
+
+fn build_c_library() -> Result<(), Box<dyn Error>> {
+    env::set_var("CXXFLAGS", llvm_config("--cxxflags")?);
+    env::set_var("CFLAGS", llvm_config("--cflags")?);
 
     cc::Build::new()
+        .cpp(true)
         .files(
-            std::fs::read_dir("cc/lib")?
-                .filter(|r| r.is_ok())
-                .map(|r| r.unwrap().path())
-                .filter(|r| r.is_file() && r.extension().unwrap() == "cpp"),
+            read_dir("cc/lib")?
+                .collect::<Result<Vec<_>, _>>()?
+                .into_iter()
+                .map(|entry| entry.path())
+                .filter(|path| path.is_file() && path.extension() == Some(OsStr::new("cpp"))),
         )
-        .cpp(true)
         .include("cc/include")
         .include(llvm_config("--includedir")?)
-        .flag(&llvm_config("--cxxflags")?)
-        .flag("-Wno-unused-parameter")
+        .flag("-Werror")
         .std("c++17")
         .compile("CTableGen");
 
-    println!("cargo:rustc-link-lib=static=CTableGen");
-
-    bindgen::builder()
-        .header("wrapper.h")
-        .clang_arg("-Icc/include")
-        .clang_arg(format!("-I{}", llvm_config("--includedir")?))
-        .default_enum_style(bindgen::EnumVariation::ModuleConsts)
-        .parse_callbacks(Box::new(bindgen::CargoCallbacks::new()))
-        .generate()
-        .unwrap()
-        .write_to_file(Path::new(&env::var("OUT_DIR")?).join("bindings.rs"))?;
-
     Ok(())
 }
 
@@ -117,9 +118,8 @@ fn llvm_config(argument: &str) -> Result<String, Box<dyn Error>> {
         .map(|path| Path::new(&path).join("bin"))
         .unwrap_or_default();
     let call = format!(
-        "{} --link-static {}",
-        prefix.join("llvm-config").display(),
-        argument
+        "{} --link-static {argument}",
+        prefix.join("llvm-config").display()
     );
 
     Ok(str::from_utf8(
@@ -137,5 +137,5 @@ fn llvm_config(argument: &str) -> Result<String, Box<dyn Error>> {
 fn parse_library_name(name: &str) -> Result<&str, String> {
     name.strip_prefix("lib")
         .and_then(|name| name.split('.').next())
-        .ok_or_else(|| format!("failed to parse library name: {}", name))
+        .ok_or_else(|| format!("failed to parse library name: {name}"))
 }
diff --git a/src/init.rs b/src/init.rs
@@ -51,7 +51,7 @@ pub enum TypedInit<'a> {
     Invalid,
 }
 
-impl<'a> TypedInit<'a> {
+impl TypedInit<'_> {
     fn variant_name(&self) -> &'static str {
         match self {
             TypedInit::Bit(_) => "Bit",
@@ -67,7 +67,7 @@ impl<'a> TypedInit<'a> {
     }
 }
 
-impl<'a> Display for TypedInit<'a> {
+impl Display for TypedInit<'_> {
     fn fmt(&self, f: &mut Formatter) -> fmt::Result {
         match self {
             Self::Bit(init) => write!(f, "{}", &init),
@@ -83,7 +83,7 @@ impl<'a> Display for TypedInit<'a> {
     }
 }
 
-impl<'a> Debug for TypedInit<'a> {
+impl Debug for TypedInit<'_> {
     fn fmt(&self, f: &mut Formatter) -> fmt::Result {
         write!(f, "TypedInit(")?;
         let name = self.variant_name();
diff --git a/src/lib.rs b/src/lib.rs
@@ -127,7 +127,7 @@ pub struct TableGenParser<'s> {
     _source_ref: PhantomData<&'s str>,
 }
 
-impl<'s> Default for TableGenParser<'s> {
+impl Default for TableGenParser<'_> {
     fn default() -> Self {
         Self::new()
     }
@@ -212,7 +212,7 @@ impl<'s> TableGenParser<'s> {
     }
 }
 
-impl<'s> Drop for TableGenParser<'s> {
+impl Drop for TableGenParser<'_> {
     fn drop(&mut self) {
         unsafe {
             tableGenFree(self.raw);
diff --git a/src/record.rs b/src/record.rs
@@ -37,7 +37,7 @@ pub struct Record<'a> {
     _reference: PhantomData<&'a TableGenRecordRef>,
 }
 
-impl<'a> Display for Record<'a> {
+impl Display for Record<'_> {
     fn fmt(&self, formatter: &mut Formatter) -> fmt::Result {
         let mut data = (formatter, Ok(()));
 
@@ -53,7 +53,7 @@ impl<'a> Display for Record<'a> {
     }
 }
 
-impl<'a> Debug for Record<'a> {
+impl Debug for Record<'_> {
     fn fmt(&self, formatter: &mut Formatter) -> fmt::Result {
         writeln!(formatter, "Record(")?;
         Display::fmt(self, formatter)?;
@@ -191,7 +191,7 @@ impl<'a> Record<'a> {
     }
 }
 
-impl<'a> SourceLoc for Record<'a> {
+impl SourceLoc for Record<'_> {
     fn source_location(self) -> SourceLocation {
         unsafe { SourceLocation::from_raw(tableGenRecordGetLoc(self.raw)) }
     }
@@ -236,7 +236,7 @@ pub struct RecordValue<'a> {
     _reference: PhantomData<&'a TableGenRecordRef>,
 }
 
-impl<'a> Display for RecordValue<'a> {
+impl Display for RecordValue<'_> {
     fn fmt(&self, formatter: &mut Formatter) -> fmt::Result {
         let mut data = (formatter, Ok(()));
 
@@ -252,7 +252,7 @@ impl<'a> Display for RecordValue<'a> {
     }
 }
 
-impl<'a> RecordValue<'a> {
+impl RecordValue<'_> {
     /// Creates a record from a raw object.
     ///
     /// # Safety
@@ -270,7 +270,7 @@ impl<'a> RecordValue<'a> {
     }
 }
 
-impl<'a> SourceLoc for RecordValue<'a> {
+impl SourceLoc for RecordValue<'_> {
     fn source_location(self) -> SourceLocation {
         unsafe { SourceLocation::from_raw(tableGenRecordValGetLoc(self.raw)) }
     }
diff --git a/src/record_keeper.rs b/src/record_keeper.rs
@@ -96,7 +96,7 @@ impl<'s> RecordKeeper<'s> {
     }
 }
 
-impl<'s> Drop for RecordKeeper<'s> {
+impl Drop for RecordKeeper<'_> {
     fn drop(&mut self) {
         unsafe {
             tableGenRecordKeeperFree(self.raw);
@@ -131,7 +131,7 @@ pub struct NamedRecordIter<'a, T> {
     _kind: PhantomData<&'a T>,
 }
 
-impl<'a, T> NamedRecordIter<'a, T> {
+impl<T> NamedRecordIter<'_, T> {
     unsafe fn from_raw(raw: TableGenRecordKeeperIteratorRef) -> Self {
         NamedRecordIter {
             raw,
@@ -159,13 +159,13 @@ impl<'a, T: NextRecord> Iterator for NamedRecordIter<'a, T> {
     }
 }
 
-impl<'a, T> Clone for NamedRecordIter<'a, T> {
+impl<T> Clone for NamedRecordIter<'_, T> {
     fn clone(&self) -> Self {
         unsafe { Self::from_raw(tableGenRecordKeeperIteratorClone(self.raw)) }
     }
 }
 
-impl<'a, T> Drop for NamedRecordIter<'a, T> {
+impl<T> Drop for NamedRecordIter<'_, T> {
     fn drop(&mut self) {
         unsafe { tableGenRecordKeeperIteratorFree(self.raw) }
     }
@@ -201,7 +201,7 @@ impl<'a> Iterator for RecordIter<'a> {
     }
 }
 
-impl<'a> Drop for RecordIter<'a> {
+impl Drop for RecordIter<'_> {
     fn drop(&mut self) {
         unsafe { tableGenRecordVectorFree(self.raw) }
     }
diff --git a/src/string_ref.rs b/src/string_ref.rs
@@ -8,7 +8,7 @@ pub struct StringRef<'a> {
     _reference: PhantomData<&'a TableGenStringRef>,
 }
 
-impl<'a> StringRef<'a> {
+impl StringRef<'_> {
     pub unsafe fn to_raw(self) -> TableGenStringRef {
         self.raw
     }
diff --git a/tools/setup.sh b/tools/setup.sh
@@ -11,5 +11,5 @@ llvm_prefix=$(brew --prefix llvm@$llvm_version)
 
 echo TABLEGEN_190_PREFIX=$llvm_prefix >>$GITHUB_ENV
 echo PATH=$llvm_prefix/bin:$PATH >>$GITHUB_ENV
-echo LIBRARY_PATH=$(brew --prefix)/lib:$LIBRARY_PATH >>$GITHUB_ENV
-echo LD_LIBRARY_PATH=$(brew --prefix)/lib:$LD_LIBRARY_PATH >>$GITHUB_ENV
+echo LIBRARY_PATH=$llvm_prefix/lib:$LIBRARY_PATH >>$GITHUB_ENV
+echo LD_LIBRARY_PATH=$llvm_prefix/lib:$LD_LIBRARY_PATH >>$GITHUB_ENV

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ pub enum TypedInit<'a> {`
`51`	`51`	`Invalid,`
`52`	`52`	`}`
`53`	`53`
`54`		`-impl<'a> TypedInit<'a> {`
	`54`	`+impl TypedInit<'_> {`
`55`	`55`	`fn variant_name(&self) -> &'static str {`
`56`	`56`	`match self {`
`57`	`57`	`TypedInit::Bit(_) => "Bit",`
`@@ -67,7 +67,7 @@ impl<'a> TypedInit<'a> {`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`
`70`		`-impl<'a> Display for TypedInit<'a> {`
	`70`	`+impl Display for TypedInit<'_> {`
`71`	`71`	`fn fmt(&self, f: &mut Formatter) -> fmt::Result {`
`72`	`72`	`match self {`
`73`	`73`	`Self::Bit(init) => write!(f, "{}", &init),`
`@@ -83,7 +83,7 @@ impl<'a> Display for TypedInit<'a> {`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`
`86`		`-impl<'a> Debug for TypedInit<'a> {`
	`86`	`+impl Debug for TypedInit<'_> {`
`87`	`87`	`fn fmt(&self, f: &mut Formatter) -> fmt::Result {`
`88`	`88`	`write!(f, "TypedInit(")?;`
`89`	`89`	`let name = self.variant_name();`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ pub struct TableGenParser<'s> {`
`127`	`127`	`_source_ref: PhantomData<&'s str>,`
`128`	`128`	`}`
`129`	`129`
`130`		`-impl<'s> Default for TableGenParser<'s> {`
	`130`	`+impl Default for TableGenParser<'_> {`
`131`	`131`	`fn default() -> Self {`
`132`	`132`	`Self::new()`
`133`	`133`	`}`
`@@ -212,7 +212,7 @@ impl<'s> TableGenParser<'s> {`
`212`	`212`	`}`
`213`	`213`	`}`
`214`	`214`
`215`		`-impl<'s> Drop for TableGenParser<'s> {`
	`215`	`+impl Drop for TableGenParser<'_> {`
`216`	`216`	`fn drop(&mut self) {`
`217`	`217`	`unsafe {`
`218`	`218`	`tableGenFree(self.raw);`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ pub struct Record<'a> {`
`37`	`37`	`_reference: PhantomData<&'a TableGenRecordRef>,`
`38`	`38`	`}`
`39`	`39`
`40`		`-impl<'a> Display for Record<'a> {`
	`40`	`+impl Display for Record<'_> {`
`41`	`41`	`fn fmt(&self, formatter: &mut Formatter) -> fmt::Result {`
`42`	`42`	`let mut data = (formatter, Ok(()));`
`43`	`43`
`@@ -53,7 +53,7 @@ impl<'a> Display for Record<'a> {`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`
`56`		`-impl<'a> Debug for Record<'a> {`
	`56`	`+impl Debug for Record<'_> {`
`57`	`57`	`fn fmt(&self, formatter: &mut Formatter) -> fmt::Result {`
`58`	`58`	`writeln!(formatter, "Record(")?;`
`59`	`59`	`Display::fmt(self, formatter)?;`
`@@ -191,7 +191,7 @@ impl<'a> Record<'a> {`
`191`	`191`	`}`
`192`	`192`	`}`
`193`	`193`
`194`		`-impl<'a> SourceLoc for Record<'a> {`
	`194`	`+impl SourceLoc for Record<'_> {`
`195`	`195`	`fn source_location(self) -> SourceLocation {`
`196`	`196`	`unsafe { SourceLocation::from_raw(tableGenRecordGetLoc(self.raw)) }`
`197`	`197`	`}`
`@@ -236,7 +236,7 @@ pub struct RecordValue<'a> {`
`236`	`236`	`_reference: PhantomData<&'a TableGenRecordRef>,`
`237`	`237`	`}`
`238`	`238`
`239`		`-impl<'a> Display for RecordValue<'a> {`
	`239`	`+impl Display for RecordValue<'_> {`
`240`	`240`	`fn fmt(&self, formatter: &mut Formatter) -> fmt::Result {`
`241`	`241`	`let mut data = (formatter, Ok(()));`
`242`	`242`
`@@ -252,7 +252,7 @@ impl<'a> Display for RecordValue<'a> {`
`252`	`252`	`}`
`253`	`253`	`}`
`254`	`254`
`255`		`-impl<'a> RecordValue<'a> {`
	`255`	`+impl RecordValue<'_> {`
`256`	`256`	`/// Creates a record from a raw object.`
`257`	`257`	`///`
`258`	`258`	`/// # Safety`
`@@ -270,7 +270,7 @@ impl<'a> RecordValue<'a> {`
`270`	`270`	`}`
`271`	`271`	`}`
`272`	`272`
`273`		`-impl<'a> SourceLoc for RecordValue<'a> {`
	`273`	`+impl SourceLoc for RecordValue<'_> {`
`274`	`274`	`fn source_location(self) -> SourceLocation {`
`275`	`275`	`unsafe { SourceLocation::from_raw(tableGenRecordValGetLoc(self.raw)) }`
`276`	`276`	`}`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ impl<'s> RecordKeeper<'s> {`
`96`	`96`	`}`
`97`	`97`	`}`
`98`	`98`
`99`		`-impl<'s> Drop for RecordKeeper<'s> {`
	`99`	`+impl Drop for RecordKeeper<'_> {`
`100`	`100`	`fn drop(&mut self) {`
`101`	`101`	`unsafe {`
`102`	`102`	`tableGenRecordKeeperFree(self.raw);`
`@@ -131,7 +131,7 @@ pub struct NamedRecordIter<'a, T> {`
`131`	`131`	`_kind: PhantomData<&'a T>,`
`132`	`132`	`}`
`133`	`133`
`134`		`-impl<'a, T> NamedRecordIter<'a, T> {`
	`134`	`+impl<T> NamedRecordIter<'_, T> {`
`135`	`135`	`unsafe fn from_raw(raw: TableGenRecordKeeperIteratorRef) -> Self {`
`136`	`136`	`NamedRecordIter {`
`137`	`137`	`raw,`
`@@ -159,13 +159,13 @@ impl<'a, T: NextRecord> Iterator for NamedRecordIter<'a, T> {`
`159`	`159`	`}`
`160`	`160`	`}`
`161`	`161`
`162`		`-impl<'a, T> Clone for NamedRecordIter<'a, T> {`
	`162`	`+impl<T> Clone for NamedRecordIter<'_, T> {`
`163`	`163`	`fn clone(&self) -> Self {`
`164`	`164`	`unsafe { Self::from_raw(tableGenRecordKeeperIteratorClone(self.raw)) }`
`165`	`165`	`}`
`166`	`166`	`}`
`167`	`167`
`168`		`-impl<'a, T> Drop for NamedRecordIter<'a, T> {`
	`168`	`+impl<T> Drop for NamedRecordIter<'_, T> {`
`169`	`169`	`fn drop(&mut self) {`
`170`	`170`	`unsafe { tableGenRecordKeeperIteratorFree(self.raw) }`
`171`	`171`	`}`
`@@ -201,7 +201,7 @@ impl<'a> Iterator for RecordIter<'a> {`
`201`	`201`	`}`
`202`	`202`	`}`
`203`	`203`
`204`		`-impl<'a> Drop for RecordIter<'a> {`
	`204`	`+impl Drop for RecordIter<'_> {`
`205`	`205`	`fn drop(&mut self) {`
`206`	`206`	`unsafe { tableGenRecordVectorFree(self.raw) }`
`207`	`207`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ pub struct StringRef<'a> {`
`8`	`8`	`_reference: PhantomData<&'a TableGenStringRef>,`
`9`	`9`	`}`
`10`	`10`
`11`		`-impl<'a> StringRef<'a> {`
	`11`	`+impl StringRef<'_> {`
`12`	`12`	`pub unsafe fn to_raw(self) -> TableGenStringRef {`
`13`	`13`	`self.raw`
`14`	`14`	`}`