Skip to content

Commit 7ea049f

Browse files
eval-execeval-exec
committed
enhance: Replace unwrap() with Result to handle errors
1 parent 36acf47 commit 7ea049f

File tree

1 file changed

+45
-32
lines changed

1 file changed

+45
-32
lines changed

‎src/macros.rs‎

Lines changed: 45 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -213,8 +213,9 @@ fn test_histogram_opts_trailing_comma() {
213213
#[macro_export(local_inner_macros)]
214214
macro_rules! register_counter {
215215
(@of_type $TYPE:ident, $OPTS:expr) => {{
216-
let counter = $crate::$TYPE::with_opts($OPTS).unwrap();
217-
$crate::register(Box::new(counter.clone())).map(|_| counter)
216+
$crate::$TYPE::with_opts($OPTS).and_then(|counter| {
217+
$crate::register(Box::new(counter.clone())).map(|_| counter)
218+
})
218219
}};
219220

220221
($OPTS:expr $(,)?) => {{
@@ -259,8 +260,9 @@ fn test_register_counter_trailing_comma() {
259260
#[macro_export(local_inner_macros)]
260261
macro_rules! register_counter_with_registry {
261262
(@of_type $TYPE: ident, $OPTS:expr, $REGISTRY:expr) => {{
262-
let counter = $crate::$TYPE::with_opts($OPTS).unwrap();
263-
$REGISTRY.register(Box::new(counter.clone())).map(|_| counter)
263+
$crate::$TYPE::with_opts($OPTS).and_then(|counter| {
264+
$REGISTRY.register(Box::new(counter.clone())).map(|_| counter)
265+
})
264266
}};
265267

266268
($OPTS:expr, $REGISTRY:expr $(,)?) => {{
@@ -360,15 +362,19 @@ fn test_register_int_counter() {
360362
#[doc(hidden)]
361363
macro_rules! __register_counter_vec {
362364
($TYPE:ident, $OPTS:expr, $LABELS_NAMES:expr) => {{
363-
let counter_vec = $crate::$TYPE::new($OPTS, $LABELS_NAMES).unwrap();
364-
$crate::register(Box::new(counter_vec.clone())).map(|_| counter_vec)
365+
$crate::$TYPE::new($OPTS, $LABELS_NAMES).and_then(|counter_vec| {
366+
$crate::default_registry()
367+
.register(Box::new(counter_vec.clone()))
368+
.map(|_| counter_vec)
369+
})
365370
}};
366371

367372
($TYPE:ident, $OPTS:expr, $LABELS_NAMES:expr, $REGISTRY:expr) => {{
368-
let counter_vec = $crate::$TYPE::new($OPTS, $LABELS_NAMES).unwrap();
369-
$REGISTRY
370-
.register(Box::new(counter_vec.clone()))
371-
.map(|_| counter_vec)
373+
$crate::$TYPE::new($OPTS, $LABELS_NAMES).and_then(|counter_vec| {
374+
$REGISTRY
375+
.register(Box::new(counter_vec.clone()))
376+
.map(|_| counter_vec)
377+
})
372378
}};
373379
}
374380

@@ -542,13 +548,16 @@ fn test_register_int_counter_vec() {
542548
#[doc(hidden)]
543549
macro_rules! __register_gauge {
544550
($TYPE:ident, $OPTS:expr) => {{
545-
let gauge = $crate::$TYPE::with_opts($OPTS).unwrap();
546-
$crate::register(Box::new(gauge.clone())).map(|_| gauge)
551+
$crate::$TYPE::with_opts($OPTS).and_then(|gauge| {
552+
$crate::default_registry()
553+
.register(Box::new(gauge.clone()))
554+
.map(|_| gauge)
555+
})
547556
}};
548557

549558
($TYPE:ident, $OPTS:expr, $REGISTRY:expr) => {{
550-
let gauge = $crate::$TYPE::with_opts($OPTS).unwrap();
551-
$REGISTRY.register(Box::new(gauge.clone())).map(|_| gauge)
559+
$crate::$TYPE::with_opts($OPTS)
560+
.and_then(|gauge| $REGISTRY.register(Box::new(gauge.clone())).map(|_| gauge))
552561
}};
553562
}
554563

@@ -669,15 +678,16 @@ macro_rules! register_int_gauge_with_registry {
669678
#[doc(hidden)]
670679
macro_rules! __register_gauge_vec {
671680
($TYPE:ident, $OPTS:expr, $LABELS_NAMES:expr $(,)?) => {{
672-
let gauge_vec = $crate::$TYPE::new($OPTS, $LABELS_NAMES).unwrap();
673-
$crate::register(Box::new(gauge_vec.clone())).map(|_| gauge_vec)
681+
$crate::$TYPE::new($OPTS, $LABELS_NAMES)
682+
.and_then(|gauge_vec| $crate::register(Box::new(gauge_vec.clone())).map(|_| gauge_vec))
674683
}};
675684

676685
($TYPE:ident, $OPTS:expr, $LABELS_NAMES:expr, $REGISTRY:expr $(,)?) => {{
677-
let gauge_vec = $crate::$TYPE::new($OPTS, $LABELS_NAMES).unwrap();
678-
$REGISTRY
679-
.register(Box::new(gauge_vec.clone()))
680-
.map(|_| gauge_vec)
686+
$crate::$TYPE::new($OPTS, $LABELS_NAMES).and_then(|gauge_vec| {
687+
$REGISTRY
688+
.register(Box::new(gauge_vec.clone()))
689+
.map(|_| gauge_vec)
690+
})
681691
}};
682692
}
683693

@@ -916,8 +926,8 @@ macro_rules! register_histogram {
916926
};
917927

918928
($HOPTS:expr $(,)?) => {{
919-
let histogram = $crate::Histogram::with_opts($HOPTS).unwrap();
920-
$crate::register(Box::new(histogram.clone())).map(|_| histogram)
929+
$crate::Histogram::with_opts($HOPTS)
930+
.and_then(|histogram| $crate::register(Box::new(histogram.clone())).map(|_| histogram))
921931
}};
922932
}
923933

@@ -971,10 +981,11 @@ macro_rules! register_histogram_with_registry {
971981
};
972982

973983
($HOPTS:expr, $REGISTRY:expr $(,)?) => {{
974-
let histogram = $crate::Histogram::with_opts($HOPTS).unwrap();
975-
$REGISTRY
976-
.register(Box::new(histogram.clone()))
977-
.map(|_| histogram)
984+
$crate::Histogram::with_opts($HOPTS).and_then(|histogram| {
985+
$REGISTRY
986+
.register(Box::new(histogram.clone()))
987+
.map(|_| histogram)
988+
})
978989
}};
979990
}
980991

@@ -1029,8 +1040,9 @@ fn test_register_histogram_with_registry_trailing_comma() {
10291040
#[macro_export(local_inner_macros)]
10301041
macro_rules! register_histogram_vec {
10311042
($HOPTS:expr, $LABELS_NAMES:expr $(,)?) => {{
1032-
let histogram_vec = $crate::HistogramVec::new($HOPTS, $LABELS_NAMES).unwrap();
1033-
$crate::register(Box::new(histogram_vec.clone())).map(|_| histogram_vec)
1043+
$crate::HistogramVec::new($HOPTS, $LABELS_NAMES).and_then(|histogram_vec| {
1044+
$crate::register(Box::new(histogram_vec.clone())).map(|_| histogram_vec)
1045+
})
10341046
}};
10351047

10361048
($NAME:expr, $HELP:expr, $LABELS_NAMES:expr $(,)?) => {{
@@ -1091,10 +1103,11 @@ fn test_register_histogram_vec_trailing_comma() {
10911103
#[macro_export(local_inner_macros)]
10921104
macro_rules! register_histogram_vec_with_registry {
10931105
($HOPTS:expr, $LABELS_NAMES:expr, $REGISTRY:expr $(,)?) => {{
1094-
let histogram_vec = $crate::HistogramVec::new($HOPTS, $LABELS_NAMES).unwrap();
1095-
$REGISTRY
1096-
.register(Box::new(histogram_vec.clone()))
1097-
.map(|_| histogram_vec)
1106+
$crate::HistogramVec::new($HOPTS, $LABELS_NAMES).and_then(|histogram_vec| {
1107+
$REGISTRY
1108+
.register(Box::new(histogram_vec.clone()))
1109+
.map(|_| histogram_vec)
1110+
})
10981111
}};
10991112

11001113
($NAME:expr, $HELP:expr, $LABELS_NAMES:expr, $REGISTRY:expr $(,)?) => {{

0 commit comments

Comments
 (0)