From 7203a05479398afd2f4565dc15fd535420a04e94 Mon Sep 17 00:00:00 2001
From: Egor Zhdan <e_zhdan@apple.com>
Date: Tue, 29 Nov 2022 17:33:35 +0000
Subject: [PATCH] [cxx-interop] Replace `std` module name with the new spelling
 `CxxStdlib`

This is the second step in renaming the C++ stdlib module `std` into `CxxStdlib`.

See https://github.com/apple/swift/pull/61099.
---
 SwiftCompilerSources/Sources/Basic/Utils.swift           | 2 +-
 test/Interop/Cxx/stdlib/overlay/std-string-overlay.swift | 2 +-
 test/Interop/Cxx/stdlib/use-std-map.swift                | 2 +-
 test/Interop/Cxx/stdlib/use-std-vector.swift             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/SwiftCompilerSources/Sources/Basic/Utils.swift b/SwiftCompilerSources/Sources/Basic/Utils.swift
index 1179d86726c94..0a359bbda210f 100644
--- a/SwiftCompilerSources/Sources/Basic/Utils.swift
+++ b/SwiftCompilerSources/Sources/Basic/Utils.swift
@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 @_exported import BasicBridging
-import std
+import CxxStdlib
 
 /// The assert function to be used in the compiler.
 ///
diff --git a/test/Interop/Cxx/stdlib/overlay/std-string-overlay.swift b/test/Interop/Cxx/stdlib/overlay/std-string-overlay.swift
index 8d54714ed8c2f..ee02e0ced7c8b 100644
--- a/test/Interop/Cxx/stdlib/overlay/std-string-overlay.swift
+++ b/test/Interop/Cxx/stdlib/overlay/std-string-overlay.swift
@@ -4,7 +4,7 @@
 // REQUIRES: OS=macosx || OS=linux-gnu
 
 import StdlibUnittest
-import std
+import CxxStdlib
 
 var StdStringOverlayTestSuite = TestSuite("std::string overlay")
 
diff --git a/test/Interop/Cxx/stdlib/use-std-map.swift b/test/Interop/Cxx/stdlib/use-std-map.swift
index fba33db2abd1e..6c542beb99990 100644
--- a/test/Interop/Cxx/stdlib/use-std-map.swift
+++ b/test/Interop/Cxx/stdlib/use-std-map.swift
@@ -10,7 +10,7 @@
 
 import StdlibUnittest
 import StdMap
-import std
+import CxxStdlib
 import Cxx
 
 var StdMapTestSuite = TestSuite("StdMap")
diff --git a/test/Interop/Cxx/stdlib/use-std-vector.swift b/test/Interop/Cxx/stdlib/use-std-vector.swift
index b43293f630100..72715d0a5963b 100644
--- a/test/Interop/Cxx/stdlib/use-std-vector.swift
+++ b/test/Interop/Cxx/stdlib/use-std-vector.swift
@@ -7,7 +7,7 @@
 
 import StdlibUnittest
 import StdVector
-import std.vector
+import CxxStdlib.vector
 
 var StdVectorTestSuite = TestSuite("StdVector")