Skip to content

[ISSUE #4087]♻️Clean up existing clippy warnings of useless_vec, redundant_field_names, let_unit_value, manual_range_contains #4106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rocketmq-rust-bot merged 1 commit into from
Sep 23, 2025
Merged

[ISSUE #4087]♻️Clean up existing clippy warnings of useless_vec, redundant_field_names, let_unit_value, manual_range_contains #4106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions rocketmq-remoting/src/protocol/body/cluster_acl_version_info.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,40 +65,50 @@ mod tests {
let mut all_acl_config_data_version = HashMap::new();
all_acl_config_data_version.insert(CheetahString::from("key1"), DataVersion::default());

let _info1 = ClusterAclVersionInfo {
let info1 = ClusterAclVersionInfo {
broker_name: CheetahString::from("broker1"),
broker_addr: CheetahString::from("addr1"),
acl_config_data_version: Some(DataVersion::default()),
all_acl_config_data_version: all_acl_config_data_version.clone(),
cluster_name: CheetahString::from("cluster1"),
};

let _info2 = ClusterAclVersionInfo {
let info2 = ClusterAclVersionInfo {
broker_name: CheetahString::from("broker1"),
broker_addr: CheetahString::from("addr1"),
acl_config_data_version: Some(DataVersion::default()),
all_acl_config_data_version: all_acl_config_data_version,
all_acl_config_data_version,
cluster_name: CheetahString::from("cluster1"),
};

assert_eq!(
serde_json::to_string(&info1).unwrap(),
serde_json::to_string(&info2).unwrap()
);
}

#[test]
fn cluster_acl_version_info_inequality() {
let _info1 = ClusterAclVersionInfo {
let info1 = ClusterAclVersionInfo {
broker_name: CheetahString::from("broker1"),
broker_addr: CheetahString::from("addr1"),
acl_config_data_version: Some(DataVersion::default()),
all_acl_config_data_version: HashMap::new(),
cluster_name: CheetahString::from("cluster1"),
};

let _info2 = ClusterAclVersionInfo {
let info2 = ClusterAclVersionInfo {
broker_name: CheetahString::from("broker2"),
broker_addr: CheetahString::from("addr2"),
acl_config_data_version: None,
all_acl_config_data_version: HashMap::new(),
cluster_name: CheetahString::from("cluster2"),
};

assert_ne!(
serde_json::to_string(&info1).unwrap(),
serde_json::to_string(&info2).unwrap()
);
}

#[test]
Expand All @@ -110,7 +120,7 @@ mod tests {
broker_name: CheetahString::from("broker1"),
broker_addr: CheetahString::from("addr1"),
acl_config_data_version: Some(DataVersion::default()),
all_acl_config_data_version: all_acl_config_data_version,
all_acl_config_data_version,
cluster_name: CheetahString::from("cluster1"),
};
let serialized = serde_json::to_string(&info).unwrap();
Expand Down
49 changes: 24 additions & 25 deletions rocketmq-remoting/src/protocol/header/extra_info_util.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,13 +506,13 @@ mod tests {

#[test]
fn get_ck_queue_offset_with_valid_string() {
let result = ExtraInfoUtil::get_ck_queue_offset(&vec!["123".to_string()]).unwrap();
let result = ExtraInfoUtil::get_ck_queue_offset(&["123".to_string()]).unwrap();
assert_eq!(result, 123);
}

#[test]
fn get_ck_queue_offset_with_invalid_string() {
let result = ExtraInfoUtil::get_ck_queue_offset(&vec!["abc".to_string()]).unwrap_err();
let result = ExtraInfoUtil::get_ck_queue_offset(&["abc".to_string()]).unwrap_err();
assert_eq!(
result.to_string(),
IllegalArgument("parse ck_queue_offset error".to_string()).to_string()
Expand All @@ -521,14 +521,13 @@ mod tests {

#[test]
fn get_pop_time_with_valid_string() {
let result =
ExtraInfoUtil::get_pop_time(&vec!["123".to_string(), "456".to_string()]).unwrap();
let result = ExtraInfoUtil::get_pop_time(&["123".to_string(), "456".to_string()]).unwrap();
assert_eq!(result, 456);
}

#[test]
fn get_pop_time_with_insufficient_length() {
let result = ExtraInfoUtil::get_pop_time(&vec!["123".to_string()]).unwrap_err();
let result = ExtraInfoUtil::get_pop_time(&["123".to_string()]).unwrap_err();
assert_eq!(
result.to_string(),
IllegalArgument("getPopTime fail, extraInfoStrs length 1".to_string()).to_string()
Expand All @@ -537,7 +536,7 @@ mod tests {

#[test]
fn get_invisible_time_with_valid_string() {
let result = ExtraInfoUtil::get_invisible_time(&vec![
let result = ExtraInfoUtil::get_invisible_time(&[
"123".to_string(),
"456".to_string(),
"789".to_string(),
Expand All @@ -548,8 +547,8 @@ mod tests {

#[test]
fn get_invisible_time_with_insufficient_length() {
let result = ExtraInfoUtil::get_invisible_time(&vec!["123".to_string(), "456".to_string()])
.unwrap_err();
let result =
ExtraInfoUtil::get_invisible_time(&["123".to_string(), "456".to_string()]).unwrap_err();
assert_eq!(
result.to_string(),
IllegalArgument("getInvisibleTime fail, extraInfoStrs length 2".to_string())
Expand All @@ -559,7 +558,7 @@ mod tests {

#[test]
fn get_revive_qid_with_valid_string() {
let result = ExtraInfoUtil::get_revive_qid(&vec![
let result = ExtraInfoUtil::get_revive_qid(&[
"123".to_string(),
"456".to_string(),
"789".to_string(),
Expand All @@ -571,7 +570,7 @@ mod tests {

#[test]
fn get_revive_qid_with_insufficient_length() {
let result = ExtraInfoUtil::get_revive_qid(&vec![
let result = ExtraInfoUtil::get_revive_qid(&[
"123".to_string(),
"456".to_string(),
"789".to_string(),
Expand All @@ -586,7 +585,7 @@ mod tests {
#[test]
fn get_real_topic_with_retry_v1() {
let result = ExtraInfoUtil::get_real_topic(
&vec![
&[
"123".to_string(),
"456".to_string(),
"789".to_string(),
Expand All @@ -603,7 +602,7 @@ mod tests {
#[test]
fn get_real_topic_with_retry_v2() {
let result = ExtraInfoUtil::get_real_topic(
&vec![
&[
"123".to_string(),
"456".to_string(),
"789".to_string(),
Expand All @@ -620,7 +619,7 @@ mod tests {
#[test]
fn get_real_topic_with_normal_topic() {
let result = ExtraInfoUtil::get_real_topic(
&vec![
&[
"123".to_string(),
"456".to_string(),
"789".to_string(),
Expand All @@ -637,7 +636,7 @@ mod tests {
#[test]
fn get_real_topic_with_insufficient_length() {
let result = ExtraInfoUtil::get_real_topic(
&vec![
&[
"123".to_string(),
"456".to_string(),
"789".to_string(),
Expand All @@ -664,7 +663,7 @@ mod tests {

#[test]
fn get_retry_slice_with_valid_string() {
let result = ExtraInfoUtil::get_retry(&vec![
let result = ExtraInfoUtil::get_retry(&[
"123".to_string(),
"456".to_string(),
"789".to_string(),
Expand All @@ -677,7 +676,7 @@ mod tests {

#[test]
fn get_retry_slice_with_insufficient_length() {
let result = ExtraInfoUtil::get_retry(&vec![
let result = ExtraInfoUtil::get_retry(&[
"123".to_string(),
"456".to_string(),
"789".to_string(),
Expand All @@ -692,7 +691,7 @@ mod tests {

#[test]
fn get_broker_name_with_valid_string() {
let result = ExtraInfoUtil::get_broker_name(&vec![
let result = ExtraInfoUtil::get_broker_name(&[
"123".to_string(),
"456".to_string(),
"789".to_string(),
Expand All @@ -706,7 +705,7 @@ mod tests {

#[test]
fn get_broker_name_with_insufficient_length() {
let result = ExtraInfoUtil::get_broker_name(&vec![
let result = ExtraInfoUtil::get_broker_name(&[
"123".to_string(),
"456".to_string(),
"789".to_string(),
Expand All @@ -722,7 +721,7 @@ mod tests {

#[test]
fn get_queue_id_with_valid_string() {
let result = ExtraInfoUtil::get_queue_id(&vec![
let result = ExtraInfoUtil::get_queue_id(&[
"123".to_string(),
"456".to_string(),
"789".to_string(),
Expand All @@ -737,7 +736,7 @@ mod tests {

#[test]
fn get_queue_id_with_insufficient_length() {
let result = ExtraInfoUtil::get_queue_id(&vec![
let result = ExtraInfoUtil::get_queue_id(&[
"123".to_string(),
"456".to_string(),
"789".to_string(),
Expand All @@ -754,7 +753,7 @@ mod tests {

#[test]
fn get_queue_offset_with_valid_string() {
let result = ExtraInfoUtil::get_queue_offset(&vec![
let result = ExtraInfoUtil::get_queue_offset(&[
"123".to_string(),
"456".to_string(),
"789".to_string(),
Expand All @@ -770,7 +769,7 @@ mod tests {

#[test]
fn get_queue_offset_with_insufficient_length() {
let result = ExtraInfoUtil::get_queue_offset(&vec![
let result = ExtraInfoUtil::get_queue_offset(&[
"123".to_string(),
"456".to_string(),
"789".to_string(),
Expand Down Expand Up @@ -830,7 +829,7 @@ mod tests {
#[test]
fn build_msg_offset_info_creates_correct_string() {
let mut string_builder = String::new();
ExtraInfoUtil::build_msg_offset_info(&mut string_builder, "topic", 7, &vec![100, 200, 300]);
ExtraInfoUtil::build_msg_offset_info(&mut string_builder, "topic", 7, &[100, 200, 300]);
assert_eq!(string_builder, "0 7 100;200;300");
}

Expand Down Expand Up @@ -897,7 +896,7 @@ mod tests {

#[test]
fn is_order_with_order_queue() {
let result = ExtraInfoUtil::is_order(&vec![
let result = ExtraInfoUtil::is_order(&[
"123".to_string(),
"456".to_string(),
"789".to_string(),
Expand All @@ -913,7 +912,7 @@ mod tests {

#[test]
fn is_order_with_non_order_queue() {
let result = ExtraInfoUtil::is_order(&vec![
let result = ExtraInfoUtil::is_order(&[
"123".to_string(),
"456".to_string(),
"789".to_string(),
Expand Down
8 changes: 4 additions & 4 deletions rocketmq/src/schedule.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,8 +747,8 @@ mod tests {
},
);

let _ = tokio::time::sleep(Duration::from_secs(1));
let _ = manager.cancel_task(task_id);
time::sleep(Duration::from_millis(400)).await;
manager.cancel_task(task_id);
assert_eq!(manager.task_count(), 0);
}

Expand Down Expand Up @@ -806,7 +806,7 @@ mod tests {

let executed = counter.load(Ordering::Relaxed);
assert!(
executed >= 3 && executed <= 6,
(3..=6).contains(&executed),
"FixedDelay count unexpected: {}",
executed
);
Expand Down Expand Up @@ -835,7 +835,7 @@ mod tests {

let executed = counter.load(Ordering::Relaxed);
assert!(
executed >= 2 && executed <= 5,
(2..=5).contains(&executed),
"FixedRateNoOverlap count unexpected: {}",
executed
);
Expand Down
Loading