Skip to content

Commit e740e70

Browse files
committed
fix:polaris-rust clippy
1 parent 6699f30 commit e740e70

File tree

5 files changed

+15
-37
lines changed

5 files changed

+15
-37
lines changed

src/core/plugin/plugins.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,6 @@ pub struct PluginContainer {
198198
load_balancers: HashMap<String, fn() -> Box<dyn LoadBalancer>>,
199199
}
200200

201-
202201
impl PluginContainer {
203202
pub fn register_all_plugin(&mut self) {
204203
self.register_resource_cache();
@@ -298,8 +297,6 @@ pub fn acquire_client_id(conf: Arc<Configuration>) -> String {
298297
uuid::Uuid::new_v4().to_string()
299298
}
300299
}
301-
Err(_err) => {
302-
uuid::Uuid::new_v4().to_string()
303-
}
300+
Err(_err) => uuid::Uuid::new_v4().to_string(),
304301
}
305302
}

src/discovery/default.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,6 @@ impl ConsumerAPI for DefaultConsumerAPI {
201201
check_ret?;
202202

203203
let engine = self.context.get_engine();
204-
205204

206205
engine.get_service_instances(req, false).await
207206
}
@@ -225,9 +224,7 @@ impl ConsumerAPI for DefaultConsumerAPI {
225224
let mut watchers = self.watchers.watchers.write().await;
226225

227226
let watch_key = req.get_key();
228-
let items = watchers
229-
.entry(watch_key.clone())
230-
.or_insert_with(Vec::new);
227+
let items = watchers.entry(watch_key.clone()).or_insert_with(Vec::new);
231228

232229
items.push(InstanceWatcher { req });
233230
Ok(WatchInstanceResponse {})

src/plugins/cache/memory/memory.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ use crate::core::plugin::cache::{
3030
Action, Filter, InitResourceCacheOption, ResourceCache, ResourceListener,
3131
};
3232
use crate::core::plugin::connector::{Connector, ResourceHandler};
33-
use crate::core::plugin::plugins::{Plugin};
33+
use crate::core::plugin::plugins::Plugin;
3434
use std::collections::HashMap;
3535
use std::sync::Arc;
3636

@@ -419,7 +419,7 @@ impl ResourceCache for MemoryCache {
419419
let waiter = {
420420
let safe_map = self.handler.router_rules.read().await;
421421
let cache_val = safe_map.get(&search_key).unwrap();
422-
422+
423423
cache_val.wait_initialize(filter.timeout).await
424424
};
425425
waiter();
@@ -459,7 +459,7 @@ impl ResourceCache for MemoryCache {
459459
let waiter = {
460460
let safe_map = self.handler.ratelimit_rules.read().await;
461461
let cache_val = safe_map.get(&search_key).unwrap();
462-
462+
463463
cache_val.wait_initialize(filter.timeout).await
464464
};
465465
waiter();
@@ -495,7 +495,7 @@ impl ResourceCache for MemoryCache {
495495
let waiter = {
496496
let safe_map = self.handler.circuitbreaker_rules.read().await;
497497
let cache_val = safe_map.get(&search_key).unwrap();
498-
498+
499499
cache_val.wait_initialize(filter.timeout).await
500500
};
501501
waiter();
@@ -531,7 +531,7 @@ impl ResourceCache for MemoryCache {
531531
let waiter = {
532532
let safe_map = self.handler.faultdetect_rules.read().await;
533533
let cache_val = safe_map.get(&search_key).unwrap();
534-
534+
535535
cache_val.wait_initialize(filter.timeout).await
536536
};
537537
waiter();
@@ -576,7 +576,7 @@ impl ResourceCache for MemoryCache {
576576
let waiter = {
577577
let safe_map = self.handler.services.read().await;
578578
let cache_val = safe_map.get(&search_key).unwrap();
579-
579+
580580
cache_val.wait_initialize(filter.timeout).await
581581
};
582582
waiter();
@@ -620,7 +620,7 @@ impl ResourceCache for MemoryCache {
620620
let waiter = {
621621
let safe_map = self.handler.instances.read().await;
622622
let cache_val = safe_map.get(&search_key).unwrap();
623-
623+
624624
cache_val.wait_initialize(filter.timeout).await
625625
};
626626
waiter();
@@ -662,7 +662,7 @@ impl ResourceCache for MemoryCache {
662662
let waiter = {
663663
let safe_map = self.handler.config_files.read().await;
664664
let cache_val = safe_map.get(&search_key).unwrap();
665-
665+
666666
cache_val.wait_initialize(filter.timeout).await
667667
};
668668
waiter();
@@ -712,7 +712,7 @@ impl ResourceCache for MemoryCache {
712712
let waiter = {
713713
let safe_map = self.handler.config_groups.read().await;
714714
let cache_val = safe_map.get(&search_key).unwrap();
715-
715+
716716
cache_val.wait_initialize(filter.timeout).await
717717
};
718718
waiter();

src/plugins/connector/grpc/connector.rs

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ use std::collections::HashMap;
3232
use std::str::FromStr;
3333
use std::sync::Arc;
3434
use std::thread::sleep;
35-
use std::time::{Duration};
35+
use std::time::Duration;
3636
use tokio::runtime::Runtime;
3737
use tokio::sync::mpsc::{self, UnboundedReceiver, UnboundedSender};
3838
use tokio::sync::RwLock;
@@ -68,11 +68,6 @@ fn new_connector(opt: InitConnectorOption) -> Box<dyn Connector> {
6868
let conf = &opt.conf.global.server_connectors.clone();
6969
let (discover_channel, config_channel) = create_channel(conf);
7070

71-
let client_id = opt.client_id.clone();
72-
73-
let connect_timeout = conf.connect_timeout;
74-
let server_switch_interval = conf.server_switch_interval;
75-
7671
let discover_grpc_client = create_discover_grpc_client(discover_channel.clone());
7772
let config_grpc_client = create_config_grpc_client(config_channel.clone());
7873

@@ -154,15 +149,9 @@ fn create_channel(conf: &ServerConnectorConfig) -> (Channel, Channel) {
154149

155150
for ele in addresses {
156151
if ele.starts_with("discover://") {
157-
discover_address.push(format!(
158-
"http://{}",
159-
ele.trim_start_matches("discover://")
160-
));
152+
discover_address.push(format!("http://{}", ele.trim_start_matches("discover://")));
161153
} else if ele.starts_with("config://") {
162-
config_address.push(format!(
163-
"http://{}",
164-
ele.trim_start_matches("config://")
165-
));
154+
config_address.push(format!("http://{}", ele.trim_start_matches("config://")));
166155
}
167156
}
168157

src/router/default.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,7 @@ impl RouterAPI for DefaultRouterAPI {
5252
let mut lb_policy = criteria.policy.clone();
5353

5454
if lb_policy.is_empty() {
55-
lb_policy.clone_from(&self
56-
.context
57-
.conf
58-
.consumer
59-
.load_balancer
60-
.default_policy);
55+
lb_policy.clone_from(&self.context.conf.consumer.load_balancer.default_policy);
6156
}
6257

6358
let lb = self

0 commit comments

Comments
 (0)