Skip to content

Commit 5fea9dc

Browse files
dlachaumedlachaume
committed
chore: remove _2021 suffixes from macro expressions added by cargo fix --edition 
1 parent 3fa205c commit 5fea9dc

File tree

19 files changed

+53
-51
lines changed

19 files changed

+53
-51
lines changed

‎internal/cardano-node/mithril-cardano-node-chain/src/chain_observer/cli_observer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@ mod tests {
573573
use super::*;
574574

575575
macro_rules! assert_cli_command {
576-
($command:expr_2021, $expected_shell:expr_2021, envs: $envs:expr_2021) => {
576+
($command:expr, $expected_shell:expr, envs: $envs:expr) => {
577577
let cmd = $command;
578578
let std_cmd = cmd.as_std();
579579
let cmd_display = format!("{std_cmd:?}");

‎internal/mithril-cli-helper/src/source_config.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
/// Register an optional parameter in the config map when it's not None.
44
#[macro_export]
55
macro_rules! register_config_value_option {
6-
( $map:ident, $namespace:expr_2021, $self:ident.$command:ident ) => {{
6+
( $map:ident, $namespace:expr, $self:ident.$command:ident ) => {{
77
if let Some(value) = $self.$command.clone() {
88
register_config_value!($map, $namespace, $command = value);
99
}
1010
}};
11-
( $map:ident, $namespace:expr_2021, $self:ident.$command:ident, $mapping:expr_2021 ) => {{
11+
( $map:ident, $namespace:expr, $self:ident.$command:ident, $mapping:expr ) => {{
1212
if let Some(value) = $self.$command.clone() {
1313
register_config_value!($map, $namespace, $command = $mapping(value));
1414
}
@@ -18,7 +18,7 @@ macro_rules! register_config_value_option {
1818
/// Register a boolean parameter in the config map only when it's true.
1919
#[macro_export]
2020
macro_rules! register_config_value_bool {
21-
( $map:ident, $namespace:expr_2021, $self:ident.$command:ident ) => {{
21+
( $map:ident, $namespace:expr, $self:ident.$command:ident ) => {{
2222
if $self.$command {
2323
register_config_value!($map, $namespace, $command = true);
2424
}
@@ -35,14 +35,14 @@ macro_rules! register_config_value_bool {
3535
/// register_config_value!(map, namespace, identifier = value)
3636
#[macro_export]
3737
macro_rules! register_config_value {
38-
( $map:ident, $namespace:expr_2021, $self:ident.$command:ident ) => {{
38+
( $map:ident, $namespace:expr, $self:ident.$command:ident ) => {{
3939
register_config_value!($map, $namespace, $command = $self.$command);
4040
}};
41-
( $map:ident, $namespace:expr_2021, $self:ident.$command:ident, $mapping:expr_2021 ) => {{
41+
( $map:ident, $namespace:expr, $self:ident.$command:ident, $mapping:expr ) => {{
4242
register_config_value!($map, $namespace, $command = $mapping($self.$command));
4343
}};
4444

45-
( $map:ident, $namespace:expr_2021, $command:ident = $value:expr_2021 ) => {{
45+
( $map:ident, $namespace:expr, $command:ident = $value:expr ) => {{
4646
$map.insert(
4747
stringify!($command).to_string(),
4848
config::Value::new(Some($namespace), $value),

‎internal/mithril-metric/src/helper.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ pub mod re_export {
4949
#[macro_export]
5050
macro_rules! build_metrics_service {
5151

52-
($service:ident, $($metric_attribute:ident:$metric_type:ident ($name:literal, $help:literal $(, $labels:expr_2021)?)),*) => {
52+
($service:ident, $($metric_attribute:ident:$metric_type:ident ($name:literal, $help:literal $(, $labels:expr)?)),*) => {
5353
use $crate::helper::re_export::paste;
5454
use $crate::helper::re_export::prometheus;
5555
paste::item! {

‎mithril-aggregator/src/artifact_builder/cardano_database_artifacts/immutable.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ mod tests {
333333
}
334334

335335
macro_rules! assert_file_content {
336-
($path:expr_2021, $expected_content:expr_2021) => {
336+
($path:expr, $expected_content:expr) => {
337337
assert!($path.exists());
338338
let content = std::fs::read_to_string(&$path).unwrap();
339339
assert_eq!(content, $expected_content);

‎mithril-aggregator/src/dependency_injection/builder/mod.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ macro_rules! get_dependency {
7575
get_dependency!($self.$attribute = $self.[<build_ $attribute>]().await?)
7676
}
7777
}};
78-
( $self:ident.$attribute:ident = $builder:expr_2021 ) => {{
78+
( $self:ident.$attribute:ident = $builder:expr ) => {{
7979
paste::paste! {
8080
if $self.$attribute.is_none() {
8181
$self.$attribute = Some($builder);
@@ -426,7 +426,9 @@ impl DependenciesBuilder {
426426
/// Create the HTTP route instance
427427
pub async fn create_http_routes(
428428
&mut self,
429-
) -> Result<impl Filter<Extract = (impl warp::Reply + use<>,), Error = warp::Rejection> + Clone + use<>> {
429+
) -> Result<
430+
impl Filter<Extract = (impl warp::Reply + use<>,), Error = warp::Rejection> + Clone + use<>,
431+
> {
430432
let dependency_container = Arc::new(self.build_serve_dependencies_container().await?);
431433
let snapshot_dir = self.configuration.get_snapshot_dir()?;
432434
let router_state = RouterState::new(

‎mithril-aggregator/src/http_server/routes/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ mod status;
1515
/// if it was an Error. Else return the unwrapped value.
1616
#[macro_export]
1717
macro_rules! unwrap_to_internal_server_error {
18-
($code:expr_2021, $logger:expr_2021 => $($warn_comment:tt)*) => {
18+
($code:expr, $logger:expr => $($warn_comment:tt)*) => {
1919
match $code {
2020
Ok(res) => res,
2121
Err(err) => {

‎mithril-aggregator/src/services/aggregator_client.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ mod tests {
335335
}
336336

337337
macro_rules! assert_error_text_contains {
338-
($error: expr_2021, $expect_contains: expr_2021) => {
338+
($error: expr, $expect_contains: expr) => {
339339
let error = &$error;
340340
assert!(
341341
error.contains($expect_contains),

‎mithril-aggregator/tests/test_extensions/metrics_tester.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ impl MetricsVerifier {
8787

8888
pub fn verify(&self, expected_metrics: ExpectedMetrics) {
8989
macro_rules! verify_metric {
90-
($expected_metric:expr_2021, $metric:expr_2021) => {
90+
($expected_metric:expr, $metric:expr) => {
9191
if let Some(expected) = $expected_metric {
9292
assert_eq!(
9393
expected,

‎mithril-aggregator/tests/test_extensions/runtime_tester.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ use crate::test_extensions::{AggregatorObserver, ExpectedCertificate, MetricsVer
4545

4646
#[macro_export]
4747
macro_rules! cycle {
48-
( $tester:expr_2021, $expected_state:expr_2021 ) => {{
48+
( $tester:expr, $expected_state:expr ) => {{
4949
use $crate::test_extensions::ExpectedMetrics;
5050

5151
let (runtime_cycle_success, runtime_cycle_total) =
@@ -65,7 +65,7 @@ macro_rules! cycle {
6565

6666
#[macro_export]
6767
macro_rules! cycle_err {
68-
( $tester:expr_2021, $expected_state:expr_2021 ) => {{
68+
( $tester:expr, $expected_state:expr ) => {{
6969
use $crate::test_extensions::ExpectedMetrics;
7070

7171
let (runtime_cycle_success, runtime_cycle_total) =
@@ -87,7 +87,7 @@ macro_rules! cycle_err {
8787

8888
#[macro_export]
8989
macro_rules! assert_last_certificate_eq {
90-
( $tester:expr_2021, $expected_certificate:expr_2021 ) => {{
90+
( $tester:expr, $expected_certificate:expr ) => {{
9191
if let Some(signed_type) = $expected_certificate.get_signed_type() {
9292
$tester.wait_until_signed_entity(&signed_type).await.unwrap();
9393
}
@@ -101,7 +101,7 @@ macro_rules! assert_last_certificate_eq {
101101

102102
#[macro_export]
103103
macro_rules! assert_metrics_eq {
104-
( $tester:expr_2021, $expected_metrics:expr_2021 ) => {{
104+
( $tester:expr, $expected_metrics:expr ) => {{
105105
$tester.verify($expected_metrics);
106106
}};
107107
}

‎mithril-client-cli/src/utils/feedback_receiver.rs

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ mod tests {
244244
const DOWNLOAD_ID: &str = "id";
245245

246246
macro_rules! send_event {
247-
(cardano_db, dl_started => $sender:expr_2021, total:$total_immutable:expr_2021, ancillary:$include_ancillary:expr_2021) => {
247+
(cardano_db, dl_started => $sender:expr, total:$total_immutable:expr, ancillary:$include_ancillary:expr) => {
248248
$sender
249249
.send_event(MithrilEvent::CardanoDatabase(
250250
MithrilEventCardanoDatabase::Started {
@@ -255,7 +255,7 @@ mod tests {
255255
))
256256
.await;
257257
};
258-
(cardano_db, dl_completed => $sender:expr_2021) => {
258+
(cardano_db, dl_completed => $sender:expr) => {
259259
$sender
260260
.send_event(MithrilEvent::CardanoDatabase(
261261
MithrilEventCardanoDatabase::Completed {
@@ -264,7 +264,7 @@ mod tests {
264264
))
265265
.await;
266266
};
267-
(cardano_db, immutable_dl, started => $sender:expr_2021, immutable:$immutable_file_number:expr_2021, size:$size:expr_2021) => {
267+
(cardano_db, immutable_dl, started => $sender:expr, immutable:$immutable_file_number:expr, size:$size:expr) => {
268268
$sender
269269
.send_event(MithrilEvent::CardanoDatabase(
270270
MithrilEventCardanoDatabase::ImmutableDownloadStarted {
@@ -275,7 +275,7 @@ mod tests {
275275
))
276276
.await;
277277
};
278-
(cardano_db, immutable_dl, progress => $sender:expr_2021, immutable:$immutable_file_number:expr_2021, bytes:$downloaded_bytes:expr_2021, size:$size:expr_2021) => {
278+
(cardano_db, immutable_dl, progress => $sender:expr, immutable:$immutable_file_number:expr, bytes:$downloaded_bytes:expr, size:$size:expr) => {
279279
$sender
280280
.send_event(MithrilEvent::CardanoDatabase(
281281
MithrilEventCardanoDatabase::ImmutableDownloadProgress {
@@ -287,7 +287,7 @@ mod tests {
287287
))
288288
.await;
289289
};
290-
(cardano_db, immutable_dl, completed => $sender:expr_2021, immutable:$immutable_file_number:expr_2021) => {
290+
(cardano_db, immutable_dl, completed => $sender:expr, immutable:$immutable_file_number:expr) => {
291291
$sender
292292
.send_event(MithrilEvent::CardanoDatabase(
293293
MithrilEventCardanoDatabase::ImmutableDownloadCompleted {
@@ -297,7 +297,7 @@ mod tests {
297297
))
298298
.await;
299299
};
300-
(cardano_db, ancillary_dl, started => $sender:expr_2021, size:$size:expr_2021) => {
300+
(cardano_db, ancillary_dl, started => $sender:expr, size:$size:expr) => {
301301
$sender
302302
.send_event(MithrilEvent::CardanoDatabase(
303303
MithrilEventCardanoDatabase::AncillaryDownloadStarted {
@@ -307,7 +307,7 @@ mod tests {
307307
))
308308
.await;
309309
};
310-
(cardano_db, ancillary_dl, progress => $sender:expr_2021, bytes:$downloaded_bytes:expr_2021, size:$size:expr_2021) => {
310+
(cardano_db, ancillary_dl, progress => $sender:expr, bytes:$downloaded_bytes:expr, size:$size:expr) => {
311311
$sender
312312
.send_event(MithrilEvent::CardanoDatabase(
313313
MithrilEventCardanoDatabase::AncillaryDownloadProgress {
@@ -318,7 +318,7 @@ mod tests {
318318
))
319319
.await;
320320
};
321-
(cardano_db, ancillary_dl, completed => $sender:expr_2021) => {
321+
(cardano_db, ancillary_dl, completed => $sender:expr) => {
322322
$sender
323323
.send_event(MithrilEvent::CardanoDatabase(
324324
MithrilEventCardanoDatabase::AncillaryDownloadCompleted {
@@ -327,7 +327,7 @@ mod tests {
327327
))
328328
.await;
329329
};
330-
(cardano_db, digests_dl, started => $sender:expr_2021, size:$size:expr_2021) => {
330+
(cardano_db, digests_dl, started => $sender:expr, size:$size:expr) => {
331331
$sender
332332
.send_event(MithrilEvent::CardanoDatabase(
333333
MithrilEventCardanoDatabase::DigestDownloadStarted {
@@ -337,7 +337,7 @@ mod tests {
337337
))
338338
.await;
339339
};
340-
(cardano_db, digests_dl, progress => $sender:expr_2021, bytes:$downloaded_bytes:expr_2021, size:$size:expr_2021) => {
340+
(cardano_db, digests_dl, progress => $sender:expr, bytes:$downloaded_bytes:expr, size:$size:expr) => {
341341
$sender
342342
.send_event(MithrilEvent::CardanoDatabase(
343343
MithrilEventCardanoDatabase::DigestDownloadProgress {
@@ -348,7 +348,7 @@ mod tests {
348348
))
349349
.await;
350350
};
351-
(cardano_db, digests_dl, completed => $sender:expr_2021) => {
351+
(cardano_db, digests_dl, completed => $sender:expr) => {
352352
$sender
353353
.send_event(MithrilEvent::CardanoDatabase(
354354
MithrilEventCardanoDatabase::DigestDownloadCompleted {
@@ -357,7 +357,7 @@ mod tests {
357357
))
358358
.await;
359359
};
360-
(cardano_db_v1, full_immutables_dl, started => $sender:expr_2021, digest:$digest:expr_2021, size:$size:expr_2021) => {
360+
(cardano_db_v1, full_immutables_dl, started => $sender:expr, digest:$digest:expr, size:$size:expr) => {
361361
$sender
362362
.send_event(MithrilEvent::SnapshotDownloadStarted {
363363
download_id: DOWNLOAD_ID.to_string(),
@@ -366,7 +366,7 @@ mod tests {
366366
})
367367
.await;
368368
};
369-
(cardano_db_v1, full_immutables_dl, progress => $sender:expr_2021, bytes:$downloaded_bytes:expr_2021, size:$size:expr_2021) => {
369+
(cardano_db_v1, full_immutables_dl, progress => $sender:expr, bytes:$downloaded_bytes:expr, size:$size:expr) => {
370370
$sender
371371
.send_event(MithrilEvent::SnapshotDownloadProgress {
372372
download_id: DOWNLOAD_ID.to_string(),
@@ -375,22 +375,22 @@ mod tests {
375375
})
376376
.await;
377377
};
378-
(cardano_db_v1, full_immutables_dl, completed => $sender:expr_2021) => {
378+
(cardano_db_v1, full_immutables_dl, completed => $sender:expr) => {
379379
$sender
380380
.send_event(MithrilEvent::SnapshotDownloadCompleted {
381381
download_id: DOWNLOAD_ID.to_string(),
382382
})
383383
.await;
384384
};
385-
(cardano_db_v1, ancillary_dl, started => $sender:expr_2021, size:$size:expr_2021) => {
385+
(cardano_db_v1, ancillary_dl, started => $sender:expr, size:$size:expr) => {
386386
$sender
387387
.send_event(MithrilEvent::SnapshotAncillaryDownloadStarted {
388388
download_id: DOWNLOAD_ID.to_string(),
389389
size: $size,
390390
})
391391
.await;
392392
};
393-
(cardano_db_v1, ancillary_dl, progress => $sender:expr_2021, bytes:$downloaded_bytes:expr_2021, size:$size:expr_2021) => {
393+
(cardano_db_v1, ancillary_dl, progress => $sender:expr, bytes:$downloaded_bytes:expr, size:$size:expr) => {
394394
$sender
395395
.send_event(MithrilEvent::SnapshotAncillaryDownloadProgress {
396396
download_id: DOWNLOAD_ID.to_string(),
@@ -399,7 +399,7 @@ mod tests {
399399
})
400400
.await;
401401
};
402-
(cardano_db_v1, ancillary_dl, completed => $sender:expr_2021) => {
402+
(cardano_db_v1, ancillary_dl, completed => $sender:expr) => {
403403
$sender
404404
.send_event(MithrilEvent::SnapshotAncillaryDownloadCompleted {
405405
download_id: DOWNLOAD_ID.to_string(),

0 commit comments

Comments
 (0)