Extract turbofish_span

compiler/noirc_frontend/src/ast/statement.rs

@@ -461,6 +461,18 @@ pub struct PathSegment {
     pub span: Span,
 }
 
+impl PathSegment {
+    /// Returns the span where turbofish happen. For example:
+    ///
+    ///    foo::<T>
+    ///       ~^^^^
+    ///
+    /// Returns an empty span at the end of `foo` if there's no turbofish.
+    pub fn turbofish_span(&self) -> Span {
+        Span::from(self.ident.span().end()..self.span.end())
+    }
+}
+
 impl From<Ident> for PathSegment {
     fn from(ident: Ident) -> PathSegment {
         let span = ident.span();

compiler/noirc_frontend/src/elaborator/expressions.rs

@@ -430,11 +430,13 @@ impl<'context> Elaborator<'context> {
             }
         };
 
+        let turbofish_span = last_segment.turbofish_span();
+
         let struct_generics = self.resolve_struct_turbofish_generics(
             &r#type.borrow(),
             struct_generics,
             last_segment.generics,
-            Span::from(last_segment.ident.span().end()..last_segment.span.end()),
+            turbofish_span,
         );
 
         let struct_type = r#type.clone();

compiler/noirc_frontend/src/elaborator/patterns.rs

@@ -182,11 +182,13 @@ impl<'context> Elaborator<'context> {
             }
         };
 
+        let turbofish_span = last_segment.turbofish_span();
+
         let generics = self.resolve_struct_turbofish_generics(
             &struct_type.borrow(),
             generics,
             last_segment.generics,
-            Span::from(last_segment.ident.span().end()..last_segment.span.end()),
+            turbofish_span,
         );
 
         let actual_type = Type::Struct(struct_type.clone(), generics);