diff --git a/src/error.rs b/src/error.rs
index 23d7902..f9fe511 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -103,8 +103,8 @@
     #[cfg(feature = "printing")]
     pub fn new_spanned<T: ToTokens, U: Display>(tokens: T, message: U) -> Self {
         let mut iter = tokens.into_token_stream().into_iter();
-        let start = iter.next().map(|t| t.span()).unwrap_or_else(Span::call_site);
-        let end = iter.last().map(|t| t.span()).unwrap_or(start);
+        let start = iter.next().map_or_else(Span::call_site, |t| t.span());
+        let end = iter.last().map_or(start, |t| t.span());
         Error {
             start_span: ThreadBound::new(start),
             end_span: ThreadBound::new(end),