New upstream version 0.63.1

[cargo.git] / vendor / quote / src / spanned.rs

diff --git a/vendor/quote/src/spanned.rs b/vendor/quote/src/spanned.rs
index 55168bdd64e9133084758790c25b406c2902655e..f64c8f5dfec715dc9c5e5016bf3e5cc07b6d5033 100644 (file)
--- a/vendor/quote/src/spanned.rs
+++ b/vendor/quote/src/spanned.rs
@@ -18,10 +18,11 @@ impl<T: ?Sized + ToTokens> Spanned for T {
 }
 
 fn join_spans(tokens: TokenStream) -> Span {
+    #[cfg(not(needs_invalid_span_workaround))]
+    let mut iter = tokens.into_iter().map(|tt| tt.span());
+
+    #[cfg(needs_invalid_span_workaround)]
     let mut iter = tokens.into_iter().filter_map(|tt| {
-        // FIXME: This shouldn't be required, since optimally spans should
-        // never be invalid. This filter_map can probably be removed when
-        // https://github.com/rust-lang/rust/issues/43081 is resolved.
         let span = tt.span();
         let debug = format!("{:?}", span);
         if debug.ends_with("bytes(0..0)") {