MockBuilder: Add support for generic traits in Locations

mock-builder/src/location.rs

@@ -72,6 +72,12 @@ impl FunctionLocation {
 					.strip_suffix('>')
 					.unwrap();
 
+				// Remove generic from trait name
+				let trait_name = trait_name
+					.split_once('<')
+					.map(|(fst, _)| fst)
+					.unwrap_or(trait_name);
+
 				(struct_path, Some(trait_name.to_owned()))
 			}
 			None => (path, None),
@@ -149,6 +155,10 @@ mod tests {
 		fn generic_method<A: Into<i32>>(_: impl Into<u32>) -> FunctionLocation;
 	}
 
+	trait TraitExampleGen<G1, G2> {
+		fn foo() -> FunctionLocation;
+	}
+
 	struct Example;
 
 	impl Example {
@@ -176,6 +186,12 @@ mod tests {
 		}
 	}
 
+	impl TraitExampleGen<u32, bool> for Example {
+		fn foo() -> FunctionLocation {
+			FunctionLocation::from(|| ())
+		}
+	}
+
 	#[test]
 	fn function_location() {
 		assert_eq!(
@@ -217,6 +233,16 @@ mod tests {
 				trait_info: None,
 			}
 		);
+
+		assert_eq!(
+			Example::foo(),
+			FunctionLocation {
+				location: format!(
+					"<{PREFIX}::Example as {PREFIX}::TraitExampleGen<u32, bool>>::foo"
+				),
+				trait_info: None,
+			}
+		);
 	}
 
 	#[test]
@@ -244,6 +270,14 @@ mod tests {
 				trait_info: Some("TraitExample".into()),
 			}
 		);
+
+		assert_eq!(
+			Example::foo().normalize(),
+			FunctionLocation {
+				location: format!("{PREFIX}::Example::foo"),
+				trait_info: Some("TraitExampleGen".into()),
+			}
+		);
 	}
 
 	#[test]