Skip to content

Commit

Permalink
CI: Add windows clippy job and fix clippy errors (#330)
Browse files Browse the repository at this point in the history
* CI: Run clippy on windows

* Update cargo-clippy-before-script.sh for Windows

* Pacify clippy
  • Loading branch information
joncinque authored Mar 20, 2024
1 parent 184ba6c commit 261b3e9
Show file tree
Hide file tree
Showing 7 changed files with 36 additions and 27 deletions.
4 changes: 4 additions & 0 deletions .github/scripts/cargo-clippy-before-script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ os_name="$1"

case "$os_name" in
"Windows")
vcpkg install openssl:x64-windows-static-md
vcpkg integrate install
choco install protoc
export PROTOC='C:\ProgramData\chocolatey\lib\protoc\tools\bin\protoc.exe'
;;
"macOS")
brew install protobuf
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/cargo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ jobs:
matrix:
os:
- macos-latest-large
- windows-latest
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
Expand All @@ -53,6 +54,7 @@ jobs:
matrix:
os:
- macos-latest-large
- windows-latest
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
Expand Down
3 changes: 3 additions & 0 deletions accounts-db/src/hardened_unpack.rs
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,9 @@ where
#[cfg(windows)]
fn set_perms(dst: &Path, _mode: u32) -> std::io::Result<()> {
let mut perm = fs::metadata(dst)?.permissions();
// This is OK for Windows, but clippy doesn't realize we're doing this
// only on Windows.
#[allow(clippy::permissions_set_readonly_false)]
perm.set_readonly(false);
fs::set_permissions(dst, perm)
}
Expand Down
6 changes: 5 additions & 1 deletion geyser-plugin-manager/src/geyser_plugin_manager.rs
Original file line number Diff line number Diff line change
Expand Up @@ -451,9 +451,13 @@ mod tests {
plugin: P,
config_path: &'static str,
) -> (LoadedGeyserPlugin, Library, &'static str) {
#[cfg(unix)]
let library = libloading::os::unix::Library::this();
#[cfg(windows)]
let library = libloading::os::windows::Library::this().unwrap();
(
LoadedGeyserPlugin::new(Box::new(plugin), None),
Library::from(libloading::os::unix::Library::this()),
Library::from(library),
config_path,
)
}
Expand Down
10 changes: 3 additions & 7 deletions install/src/command.rs
Original file line number Diff line number Diff line change
Expand Up @@ -333,9 +333,7 @@ pub fn string_from_winreg_value(val: &winreg::RegValue) -> Option<String> {
let words = unsafe {
slice::from_raw_parts(val.bytes.as_ptr() as *const u16, val.bytes.len() / 2)
};
let mut s = if let Ok(s) = String::from_utf16(words) {
s
} else {
let Ok(mut s) = String::from_utf16(words) else {
return None;
};
while s.ends_with('\u{0}') {
Expand Down Expand Up @@ -392,11 +390,9 @@ fn add_to_path(new_path: &str) -> bool {
},
};

let old_path = if let Some(s) =
let Some(old_path) =
get_windows_path_var().unwrap_or_else(|err| panic!("Unable to get PATH: {}", err))
{
s
} else {
else {
return false;
};

Expand Down
7 changes: 5 additions & 2 deletions programs/sbf/benches/bpf_loader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
#![cfg(feature = "sbf_c")]
#![allow(clippy::uninlined_format_args)]
#![allow(clippy::arithmetic_side_effects)]
#![cfg_attr(not(target_arch = "x86_64"), allow(dead_code, unused_imports))]
#![cfg_attr(
any(target_os = "windows", not(target_arch = "x86_64")),
allow(dead_code, unused_imports)
)]

use {
solana_rbpf::memory_region::MemoryState,
Expand Down Expand Up @@ -103,7 +106,7 @@ fn bench_program_create_executable(bencher: &mut Bencher) {
}

#[bench]
#[cfg(target_arch = "x86_64")]
#[cfg(all(not(target_os = "windows"), target_arch = "x86_64"))]
fn bench_program_alu(bencher: &mut Bencher) {
let ns_per_s = 1000000000;
let one_million = 1000000;
Expand Down
31 changes: 14 additions & 17 deletions rpc/src/rpc_service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -878,24 +878,21 @@ mod tests {
panic!("Unexpected RequestMiddlewareAction variant");
}

#[cfg(unix)]
std::fs::remove_file(&genesis_path).unwrap();
{
std::fs::remove_file(&genesis_path).unwrap();
{
let mut file = std::fs::File::create(ledger_path.path().join("wrong")).unwrap();
file.write_all(b"wrong file").unwrap();
}
symlink::symlink_file("wrong", &genesis_path).unwrap();

// File is a symbolic link => request should fail.
let action = rrm.process_file_get(DEFAULT_GENESIS_DOWNLOAD_PATH);
if let RequestMiddlewareAction::Respond { response, .. } = action {
let response = runtime.block_on(response);
let response = response.unwrap();
assert_ne!(response.status(), 200);
} else {
panic!("Unexpected RequestMiddlewareAction variant");
}
let mut file = std::fs::File::create(ledger_path.path().join("wrong")).unwrap();
file.write_all(b"wrong file").unwrap();
}
symlink::symlink_file("wrong", &genesis_path).unwrap();

// File is a symbolic link => request should fail.
let action = rrm.process_file_get(DEFAULT_GENESIS_DOWNLOAD_PATH);
if let RequestMiddlewareAction::Respond { response, .. } = action {
let response = runtime.block_on(response);
let response = response.unwrap();
assert_ne!(response.status(), 200);
} else {
panic!("Unexpected RequestMiddlewareAction variant");
}
}
}

0 comments on commit 261b3e9

Please sign in to comment.