Skip to content

Commit 09e2457

Browse files
Fix type name formatting when a local type is used as second type param
1 parent 3ca0a5d commit 09e2457

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

crates/bevy_ecs/src/schedule/ambiguity_detection.rs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ fn collapse_type_name(string: &str) -> String {
504504
let type_name = string.split("::").last().unwrap();
505505

506506
// Account for leading white space
507-
if string.get(0..1).unwrap_or_default() == " " {
507+
if string.get(0..1).unwrap_or_default() == " " && type_name != string {
508508
format!(" {type_name}")
509509
} else {
510510
type_name.to_string()
@@ -513,8 +513,6 @@ fn collapse_type_name(string: &str) -> String {
513513

514514
#[cfg(test)]
515515
mod name_formatting_tests {
516-
use crate::schedule::ambiguity_detection::collapse_type_name;
517-
518516
use super::format_type_name;
519517

520518
#[test]
@@ -540,11 +538,6 @@ mod name_formatting_tests {
540538
assert_eq!(format_type_name("a<B, C>"), "a<B, C>".to_string())
541539
}
542540

543-
#[test]
544-
fn leading_whitespace() {
545-
assert_eq!(collapse_type_name(" foo::A"), " A")
546-
}
547-
548541
#[test]
549542
fn generics() {
550543
assert_eq!(

0 commit comments

Comments
 (0)