Skip to content

Commit b550351

Browse files
authored
fix: make clippy work again on CI (#1432)
1 parent 1b3c123 commit b550351

File tree

7 files changed

+24
-29
lines changed

7 files changed

+24
-29
lines changed

.github/workflows/clippy.yaml

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,18 @@ jobs:
2424
runs-on: ubuntu-latest
2525
permissions:
2626
contents: read
27-
security-events: write
28-
actions: read
27+
2928
steps:
3029
- name: Checkout code
3130
uses: actions/checkout@v6
31+
3232
- name: Install rust
3333
run: |
3434
rustup set auto-self-update disable
35-
rustup toolchain install 1.89.0 --profile default
3635
rustup show
36+
3737
- name: Rust cache
3838
uses: Swatinem/rust-cache@v2
39-
- name: Install required cargo packages for reporting format
40-
run: cargo install clippy-sarif sarif-fmt
41-
- name: Run rust-clippy
42-
run: |
43-
cargo clippy --all-features --all-targets --message-format=json -- -D warnings | clippy-sarif | tee results.sarif | sarif-fmt
44-
- name: Upload SARIF file
45-
uses: github/codeql-action/upload-sarif@v4
46-
with:
47-
sarif_file: "results.sarif"
39+
40+
- name: Run clippy
41+
run: cargo clippy --workspace --all-features --all-targets -- -D warnings

crates/enterprise/unleash-edge-delta/src/cache.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ mod tests {
148148
let max_length = 2;
149149
let mut delta_cache = DeltaCache::new(base_event.clone(), max_length);
150150

151-
let initial_events = &vec![DeltaEvent::FeatureUpdated {
151+
let initial_events = &[DeltaEvent::FeatureUpdated {
152152
event_id: 2,
153153
feature: ClientFeature {
154154
name: "my-feature-flag".to_string(),
@@ -233,7 +233,7 @@ mod tests {
233233
..ClientFeature::default()
234234
},
235235
};
236-
delta_cache.add_events(&vec![initial_feature_event.clone()]);
236+
delta_cache.add_events(std::slice::from_ref(&initial_feature_event));
237237

238238
let updated_feature_event = DeltaEvent::FeatureUpdated {
239239
event_id: 130,
@@ -251,7 +251,7 @@ mod tests {
251251
..ClientFeature::default()
252252
},
253253
};
254-
delta_cache.add_events(&vec![updated_feature_event.clone()]);
254+
delta_cache.add_events(std::slice::from_ref(&updated_feature_event));
255255

256256
assert_eq!(delta_cache.get_events()[1], initial_feature_event);
257257
assert_eq!(delta_cache.get_events()[2], updated_feature_event);

crates/enterprise/unleash-edge-tracing/src/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,9 @@ fn enterprise_tracing(args: &CliArgs, app_id: String) -> EdgeResult<Option<OtelH
153153
}
154154
}
155155

156+
#[allow(unused_variables)]
156157
/// Instantiates exporters for traces, metrics and logs
157158
/// the exporter will read environment variables as specified in (Otel docs)[https://opentelemetry.io/docs/specs/otel/protocol/exporter/]
158-
///
159159
pub fn init_tracing_and_logging(args: &CliArgs, app_id: String) -> EdgeResult<Option<OtelHolder>> {
160160
#[cfg(feature = "enterprise")]
161161
{
@@ -268,7 +268,6 @@ mod tests {
268268
let _ = formatting_layer::<tracing_subscriber::Registry>(&args);
269269
}
270270

271-
#[cfg(feature = "enterprise")]
272271
#[test]
273272
#[cfg(feature = "enterprise")]
274273
fn test_resource_creation() {

crates/oss/unleash-edge-feature-filters/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ mod tests {
377377
feature_cache.insert(map_key.clone(), client_features);
378378

379379
let features = feature_cache.get(&map_key).unwrap();
380-
let filter = FeatureFilterSet::from(Box::new(|f| f.name == "feature-one".to_string()));
380+
let filter = FeatureFilterSet::from(Box::new(|f| f.name == "feature-one"));
381381
let filtered_client_features = filter_client_features(&features, &filter);
382382

383383
let sent_segments = filtered_client_features.segments.as_ref().unwrap();
@@ -430,7 +430,7 @@ mod tests {
430430
feature_cache.insert(map_key.clone(), client_features);
431431

432432
let features = feature_cache.get(&map_key).unwrap();
433-
let filter = FeatureFilterSet::from(Box::new(|f| f.name == "feature-one".to_string()));
433+
let filter = FeatureFilterSet::from(Box::new(|f| f.name == "feature-one"));
434434
let filtered_client_features = filter_client_features(&features, &filter);
435435

436436
assert!(filtered_client_features.segments.is_none());

crates/oss/unleash-edge-integration-tests/src/streaming_refresher.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ mod tests {
9494

9595
delta_cache_manager.update_cache(
9696
&token.environment.clone().unwrap(),
97-
&vec![DeltaEvent::FeatureUpdated {
97+
&[DeltaEvent::FeatureUpdated {
9898
event_id: 1,
9999
feature: ClientFeature {
100100
name: "Inigo Montoya".into(),
@@ -114,7 +114,7 @@ mod tests {
114114

115115
delta_cache_manager.update_cache(
116116
&token.environment.clone().unwrap(),
117-
&vec![DeltaEvent::FeatureUpdated {
117+
&[DeltaEvent::FeatureUpdated {
118118
event_id: 1,
119119
feature: ClientFeature {
120120
name: "Westley".into(),
@@ -247,7 +247,7 @@ mod tests {
247247

248248
delta_cache_manager.update_cache(
249249
&token.environment.clone().unwrap(),
250-
&vec![DeltaEvent::FeatureUpdated {
250+
&[DeltaEvent::FeatureUpdated {
251251
event_id: 1,
252252
feature: ClientFeature {
253253
name: "Inigo Montoya".into(),
@@ -303,7 +303,7 @@ mod tests {
303303
let inject_event = async move || {
304304
delta_cache_manager.update_cache(
305305
&token.environment.clone().unwrap(),
306-
&vec![DeltaEvent::FeatureUpdated {
306+
&[DeltaEvent::FeatureUpdated {
307307
event_id: 2,
308308
feature: ClientFeature {
309309
name: "Westley".into(),
@@ -409,7 +409,7 @@ mod tests {
409409

410410
delta_cache_manager.update_cache(
411411
&token.environment.clone().unwrap(),
412-
&vec![DeltaEvent::FeatureUpdated {
412+
&[DeltaEvent::FeatureUpdated {
413413
event_id: 1,
414414
feature: ClientFeature {
415415
name: "Inigo Montoya".into(),
@@ -462,7 +462,7 @@ mod tests {
462462
let inject_event = async move || {
463463
delta_cache_manager.update_cache(
464464
&token.environment.clone().unwrap(),
465-
&vec![DeltaEvent::FeatureUpdated {
465+
&[DeltaEvent::FeatureUpdated {
466466
event_id: 2,
467467
feature: ClientFeature {
468468
name: "Westley".into(),
@@ -519,7 +519,7 @@ mod tests {
519519

520520
delta_cache_manager.update_cache(
521521
&token.environment.clone().unwrap(),
522-
&vec![DeltaEvent::FeatureUpdated {
522+
&[DeltaEvent::FeatureUpdated {
523523
event_id: 1,
524524
feature: ClientFeature {
525525
name: "Inigo Montoya".into(),
@@ -580,7 +580,7 @@ mod tests {
580580

581581
delta_cache_manager.update_cache(
582582
&token.environment.clone().unwrap(),
583-
&vec![DeltaEvent::FeatureUpdated {
583+
&[DeltaEvent::FeatureUpdated {
584584
event_id: 2,
585585
feature: ClientFeature {
586586
name: "Westley".into(),
@@ -644,7 +644,7 @@ mod tests {
644644

645645
delta_cache_manager.update_cache(
646646
&dev_token.environment.clone().unwrap(),
647-
&vec![DeltaEvent::FeatureUpdated {
647+
&[DeltaEvent::FeatureUpdated {
648648
event_id: 1,
649649
feature: ClientFeature {
650650
name: "Inigo Montoya".into(),
@@ -717,7 +717,7 @@ mod tests {
717717
);
718718
delta_cache_manager.update_cache(
719719
&prod_token.environment.clone().unwrap(),
720-
&vec![DeltaEvent::FeatureUpdated {
720+
&[DeltaEvent::FeatureUpdated {
721721
event_id: 1,
722722
feature: ClientFeature {
723723
name: "Inigo Montoya".into(),

crates/oss/unleash-edge-types/src/extract/host.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#![allow(warnings)]
12
use super::rejection::{FailedToResolveHost, HostRejection};
23
use axum_core::{
34
RequestPartsExt,

rust-toolchain.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
[toolchain]
22
channel = "1.93.0"
3+
components = ["clippy"]

0 commit comments

Comments
 (0)