rename tag

Author: AlexWaygood

conformance/results/zuban/generics_scoping.toml

@@ -1,8 +1,8 @@
 conformance_automated = "Fail"
 conformant = "Partial"
 errors_diff = """
-Lines 15, 16: Expected error (tag 'fun1-int')
-Lines 19, 20: Expected error (tag 'fun1-str')
+Lines 15, 16: Expected error (tag 'fun1')
+Lines 19, 20: Expected error (tag 'fun2')
 Lines 49, 50: Expected error (tag 'method-str')
 Lines 53, 54: Expected error (tag 'method-bytes')
 """

conformance/tests/generics_scoping.py

@@ -12,12 +12,12 @@ def fun_2(x: T) -> T:  # and here could be different
     return x
 
 # One of these two should pass; either is acceptable:
-assert_type(fun_1(1), int)  # E[fun1-int]
-assert_type(fun_1(1), Literal[1])  # E[fun1-int]
+assert_type(fun_1(1), int)  # E[fun1]
+assert_type(fun_1(1), Literal[1])  # E[fun1]
 
 # One of these two should pass; either is acceptable:
-assert_type(fun_2("a"), str)  # E[fun1-str]
-assert_type(fun_2("a"), Literal["a"])  # E[fun1-str]
+assert_type(fun_2("a"), str)  # E[fun2]
+assert_type(fun_2("a"), Literal["a"])  # E[fun2]
 
 # > A type variable used in a method of a generic class that coincides
 # > with one of the variables that parameterize this class is always bound