Fix upstream merge conflicts

This commit is contained in:
Jason Wen
2024-05-29 23:42:00 -04:00
parent 4b15faabb1
commit bdbd16c902
-16
View File
@@ -314,10 +314,6 @@ class Platforms(str, ReprEnum, metaclass=PlatformsType):
def with_flags(cls, flags: IntFlag) -> set['Platforms']:
return {p for p in cls if p.config.flags & flags}
@classmethod
def without_flags(cls, flags: IntFlag) -> set['Platforms']:
return {p for p in cls if not (p.config.flags & flags)}
@classmethod
def with_sp_flags(cls, spFlags: IntFlag) -> set['Platforms']:
return {p for p in cls if p.config.spFlags & spFlags}
@@ -325,15 +321,3 @@ class Platforms(str, ReprEnum, metaclass=PlatformsType):
@classmethod
def without_sp_flags(cls, spFlags: IntFlag) -> set['Platforms']:
return {p for p in cls if not (p.config.spFlags & spFlags)}
@classmethod
def print_debug(cls, flags):
platforms_with_flag = defaultdict(list)
for flag in flags:
for platform in cls:
if platform.config.flags & flag:
assert flag.name is not None
platforms_with_flag[flag.name].append(platform)
for flag, platforms in platforms_with_flag.items():
print(f"{flag:32s}: {', '.join(p.name for p in platforms)}")