Skip to content

Commit 553dcaf

Browse files
committed
Make ServerTiming::new return Option<Self>
1 parent fa38adc commit 553dcaf

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

src/trace/server_timing/mod.rs

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
//! let mut res = Response::new(200);
1515
//! timings.apply(&mut res);
1616
//!
17-
//! let timings = ServerTiming::from_headers(res)?;
17+
//! let timings = ServerTiming::from_headers(res).unwrap();
1818
//! let entry = timings.iter().next().unwrap();
1919
//! assert_eq!(entry.name(), "server");
2020
//! #
@@ -56,7 +56,7 @@ use crate::headers::{HeaderName, HeaderValue, Headers, ToHeaderValues, SERVER_TI
5656
/// let mut res = Response::new(200);
5757
/// timings.apply(&mut res);
5858
///
59-
/// let timings = ServerTiming::from_headers(res)?;
59+
/// let timings = ServerTiming::from_headers(res).unwrap();
6060
/// let entry = timings.iter().next().unwrap();
6161
/// assert_eq!(entry.name(), "server");
6262
/// #
@@ -74,13 +74,12 @@ impl ServerTiming {
7474
}
7575

7676
/// Create a new instance from headers.
77-
pub fn from_headers(headers: impl AsRef<Headers>) -> crate::Result<Self> {
77+
pub fn from_headers(headers: impl AsRef<Headers>) -> Option<Self> {
7878
let mut timings = vec![];
79-
let values = headers.as_ref().get(SERVER_TIMING);
80-
for value in values.iter().map(|h| h.iter()).flatten() {
81-
parse_header(value.as_str(), &mut timings)?;
79+
for value in headers.as_ref().get(SERVER_TIMING)? {
80+
parse_header(value.as_str(), &mut timings).ok()?;
8281
}
83-
Ok(Self { timings })
82+
Some(Self { timings })
8483
}
8584

8685
/// Sets the `Server-Timing` header.
@@ -241,7 +240,7 @@ mod test {
241240
let mut headers = Headers::new();
242241
timings.apply(&mut headers);
243242

244-
let timings = ServerTiming::from_headers(headers)?;
243+
let timings = ServerTiming::from_headers(headers).unwrap();
245244
let entry = timings.iter().next().unwrap();
246245
assert_eq!(entry.name(), "server");
247246
Ok(())
@@ -255,7 +254,7 @@ mod test {
255254
let mut headers = Headers::new();
256255
timings.apply(&mut headers);
257256

258-
let timings = ServerTiming::from_headers(headers)?;
257+
let timings = ServerTiming::from_headers(headers).unwrap();
259258
let entry = timings.iter().next().unwrap();
260259
assert_eq!(entry.name(), "server");
261260
Ok(())

0 commit comments

Comments
 (0)