Merge pull request #59924 from hamishknight/fix-type

Author: hamishknight

test/Parse/switch.swift

@@ -336,7 +336,8 @@ func f1(x: String, y: Whichever) {
         break
     case Whichever.buzz: // expected-error {{type 'Whichever' has no member 'buzz'}}
         break
-    case Whichever.alias: // expected-error {{referencing operator function '~=' on 'RegexComponent' requires that 'Whichever' conform to 'RegexComponent'}}
+    case Whichever.alias: // expected-error {{expression pattern of type 'Whichever' cannot match values of type 'String'}}
+    // expected-note@-1 {{overloads for '~=' exist}}
         break
     default:
       break

test/StringProcessing/Sema/regex_literal_type_inference.swift

@@ -33,7 +33,7 @@ let r7 = #/(?:(?:(.(.(.)*)?))*?)?/#
 //               ^ 1
 //                 ^ 2
 //                   ^ 3
-let _: Regex<(Substring, Substring??, Substring???, Substring????)>.Type = type(of: r7)
+let _: Regex<(Substring, Substring?, Substring?, Substring?)>.Type = type(of: r7)
 
 let r8 = #/well(?<theres_no_single_element_tuple_what_can_we>do)/#
 let _: Regex<(Substring, theres_no_single_element_tuple_what_can_we: Substring)>.Type = type(of: r8)