Skip to content

Commit

Permalink
Merge pull request #213 from tgross35/clippy
Browse files Browse the repository at this point in the history 
Fix Clippy errors and enable Clippy checks in CI
  • Loading branch information
@tgross35
tgross35 authored Aug 15, 2024
2 parents 238553a + e482305 commit d2aa0b3
Show file tree
Hide file tree
Showing 2 changed files with 79 additions and 73 deletions.
13 changes: 13 additions & 0 deletions .github/workflows/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,19 @@ env:
RUSTFLAGS: -D warnings

jobs:
clippy:
name: clippy
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Install Rust
run: |
rustup update beta --no-self-update
rustup default beta
rustup component add clippy
- uses: Swatinem/rust-cache@v2
- run: cargo clippy --all-features --all-targets -- -D warnings

test:
name: Test
runs-on: ${{ matrix.os }}
Expand Down
139 changes: 66 additions & 73 deletions src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -443,55 +443,53 @@ impl Config {
if !self.defined("CMAKE_TOOLCHAIN_FILE") {
if let Some(s) = self.getenv_target_os("CMAKE_TOOLCHAIN_FILE") {
self.define("CMAKE_TOOLCHAIN_FILE", s);
} else {
if target.contains("redox") {
if !self.defined("CMAKE_SYSTEM_NAME") {
self.define("CMAKE_SYSTEM_NAME", "Generic");
}
} else if target != host && !self.defined("CMAKE_SYSTEM_NAME") {
// Set CMAKE_SYSTEM_NAME and CMAKE_SYSTEM_PROCESSOR when cross compiling
let os = getenv_unwrap("CARGO_CFG_TARGET_OS");
let arch = getenv_unwrap("CARGO_CFG_TARGET_ARCH");
// CMAKE_SYSTEM_NAME list
// https://gitlab.kitware.com/cmake/cmake/-/issues/21489#note_1077167
//
// CMAKE_SYSTEM_PROCESSOR
// some of the values come from https://en.wikipedia.org/wiki/Uname
let (system_name, system_processor) = match (os.as_str(), arch.as_str()) {
("android", arch) => ("Android", arch),
("dragonfly", arch) => ("DragonFly", arch),
("macos", "x86_64") => ("Darwin", "x86_64"),
("macos", "aarch64") => ("Darwin", "arm64"),
("freebsd", "x86_64") => ("FreeBSD", "amd64"),
("freebsd", arch) => ("FreeBSD", arch),
("fuchsia", arch) => ("Fuchsia", arch),
("haiku", arch) => ("Haiku", arch),
("ios", "aarch64") => ("iOS", "arm64"),
("ios", arch) => ("iOS", arch),
("linux", arch) => {
let name = "Linux";
match arch {
"powerpc" => (name, "ppc"),
"powerpc64" => (name, "ppc64"),
"powerpc64le" => (name, "ppc64le"),
_ => (name, arch),
}
}
("netbsd", arch) => ("NetBSD", arch),
("openbsd", "x86_64") => ("OpenBSD", "amd64"),
("openbsd", arch) => ("OpenBSD", arch),
("solaris", arch) => ("SunOS", arch),
("tvos", arch) => ("tvOS", arch),
("watchos", arch) => ("watchOS", arch),
("windows", "x86_64") => ("Windows", "AMD64"),
("windows", "x86") => ("Windows", "X86"),
("windows", "aarch64") => ("Windows", "ARM64"),
// Others
(os, arch) => (os, arch),
};
self.define("CMAKE_SYSTEM_NAME", system_name);
self.define("CMAKE_SYSTEM_PROCESSOR", system_processor);
} else if target.contains("redox") {
if !self.defined("CMAKE_SYSTEM_NAME") {
self.define("CMAKE_SYSTEM_NAME", "Generic");
}
} else if target != host && !self.defined("CMAKE_SYSTEM_NAME") {
// Set CMAKE_SYSTEM_NAME and CMAKE_SYSTEM_PROCESSOR when cross compiling
let os = getenv_unwrap("CARGO_CFG_TARGET_OS");
let arch = getenv_unwrap("CARGO_CFG_TARGET_ARCH");
// CMAKE_SYSTEM_NAME list
// https://gitlab.kitware.com/cmake/cmake/-/issues/21489#note_1077167
//
// CMAKE_SYSTEM_PROCESSOR
// some of the values come from https://en.wikipedia.org/wiki/Uname
let (system_name, system_processor) = match (os.as_str(), arch.as_str()) {
("android", arch) => ("Android", arch),
("dragonfly", arch) => ("DragonFly", arch),
("macos", "x86_64") => ("Darwin", "x86_64"),
("macos", "aarch64") => ("Darwin", "arm64"),
("freebsd", "x86_64") => ("FreeBSD", "amd64"),
("freebsd", arch) => ("FreeBSD", arch),
("fuchsia", arch) => ("Fuchsia", arch),
("haiku", arch) => ("Haiku", arch),
("ios", "aarch64") => ("iOS", "arm64"),
("ios", arch) => ("iOS", arch),
("linux", arch) => {
let name = "Linux";
match arch {
"powerpc" => (name, "ppc"),
"powerpc64" => (name, "ppc64"),
"powerpc64le" => (name, "ppc64le"),
_ => (name, arch),
}
}
("netbsd", arch) => ("NetBSD", arch),
("openbsd", "x86_64") => ("OpenBSD", "amd64"),
("openbsd", arch) => ("OpenBSD", arch),
("solaris", arch) => ("SunOS", arch),
("tvos", arch) => ("tvOS", arch),
("watchos", arch) => ("watchOS", arch),
("windows", "x86_64") => ("Windows", "AMD64"),
("windows", "x86") => ("Windows", "X86"),
("windows", "aarch64") => ("Windows", "ARM64"),
// Others
(os, arch) => (os, arch),
};
self.define("CMAKE_SYSTEM_NAME", system_name);
self.define("CMAKE_SYSTEM_PROCESSOR", system_processor);
}
}

Expand Down Expand Up @@ -550,7 +548,7 @@ impl Config {
let mut cmake_prefix_path = Vec::new();
for dep in &self.deps {
let dep = dep.to_uppercase().replace('-', "_");
if let Some(root) = env::var_os(&format!("DEP_{}_ROOT", dep)) {
if let Some(root) = env::var_os(format!("DEP_{}_ROOT", dep)) {
cmake_prefix_path.push(PathBuf::from(root));
}
}
Expand Down Expand Up @@ -627,14 +625,11 @@ impl Config {
// If we're on MSVC we need to be sure to use the right generator or
// otherwise we won't get 32/64 bit correct automatically.
// This also guarantees that NMake generator isn't chosen implicitly.
let using_nmake_generator = {
if generator.is_none() {
cmd.arg("-G").arg(self.visual_studio_generator(&target));
false
} else {
generator.as_ref().unwrap() == "NMake Makefiles"
|| generator.as_ref().unwrap() == "NMake Makefiles JOM"
}
let using_nmake_generator = if let Some(g) = &generator {
g == "NMake Makefiles" || g == "NMake Makefiles JOM"
} else {
cmd.arg("-G").arg(self.visual_studio_generator(&target));
false
};
if !is_ninja && !using_nmake_generator {
if target.contains("x86_64") {
Expand All @@ -661,15 +656,13 @@ impl Config {
panic!("unsupported msvc target: {}", target);
}
}
} else if target.contains("darwin") {
if !self.defined("CMAKE_OSX_ARCHITECTURES") {
if target.contains("x86_64") {
cmd.arg("-DCMAKE_OSX_ARCHITECTURES=x86_64");
} else if target.contains("aarch64") {
cmd.arg("-DCMAKE_OSX_ARCHITECTURES=arm64");
} else {
panic!("unsupported darwin target: {}", target);
}
} else if target.contains("darwin") && !self.defined("CMAKE_OSX_ARCHITECTURES") {
if target.contains("x86_64") {
cmd.arg("-DCMAKE_OSX_ARCHITECTURES=x86_64");
} else if target.contains("aarch64") {
cmd.arg("-DCMAKE_OSX_ARCHITECTURES=arm64");
} else {
panic!("unsupported darwin target: {}", target);
}
}
if let Some(ref generator) = generator {
Expand All @@ -679,7 +672,7 @@ impl Config {
cmd.arg("-T").arg(generator_toolset);
}
let profile = self.get_profile().to_string();
for &(ref k, ref v) in &self.defines {
for (k, v) in &self.defines {
let mut os = OsString::from("-D");
os.push(k);
os.push("=");
Expand All @@ -696,7 +689,7 @@ impl Config {
let build_type = self
.defines
.iter()
.find(|&&(ref a, _)| a == "CMAKE_BUILD_TYPE")
.find(|&(a, _)| a == "CMAKE_BUILD_TYPE")
.map(|x| x.1.to_str().unwrap())
.unwrap_or(&profile);
let build_type_upcase = build_type
Expand Down Expand Up @@ -798,14 +791,14 @@ impl Config {
}

if !self.defined("CMAKE_BUILD_TYPE") {
cmd.arg(&format!("-DCMAKE_BUILD_TYPE={}", profile));
cmd.arg(format!("-DCMAKE_BUILD_TYPE={}", profile));
}

if self.verbose_make {
cmd.arg("-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON");
}

for &(ref k, ref v) in c_compiler.env().iter().chain(&self.env) {
for (k, v) in c_compiler.env().iter().chain(&self.env) {
cmd.env(k, v);
}

Expand All @@ -820,13 +813,13 @@ impl Config {
let mut cmd = self.cmake_build_command(&target);
cmd.current_dir(&build);

for &(ref k, ref v) in c_compiler.env().iter().chain(&self.env) {
for (k, v) in c_compiler.env().iter().chain(&self.env) {
cmd.env(k, v);
}

// If the generated project is Makefile based we should carefully transfer corresponding CARGO_MAKEFLAGS
let mut use_jobserver = false;
if fs::metadata(&build.join("Makefile")).is_ok() {
if fs::metadata(build.join("Makefile")).is_ok() {
match env::var_os("CARGO_MAKEFLAGS") {
// Only do this on non-windows and non-bsd
// On Windows, we could be invoking make instead of
Expand Down Expand Up @@ -967,7 +960,7 @@ impl Config {
}

fn defined(&self, var: &str) -> bool {
self.defines.iter().any(|&(ref a, _)| a == var)
self.defines.iter().any(|(a, _)| a == var)
}

// If a cmake project has previously been built (e.g. CMakeCache.txt already
Expand Down

0 comments on commit d2aa0b3

Please sign in to comment.