Merge pull request #60267 from apple/egorzhdan/cxx-std-string-literal

egorzhdan · web-flow · commit 055d2fdcb3c0 · 2022-07-28T13:33:31.000+01:00
[cxx-interop] Conform `std::string` to `ExpressibleByStringLiteral`
diff --git a/stdlib/public/Cxx/std/String.swift b/stdlib/public/Cxx/std/String.swift
@@ -19,6 +19,12 @@ extension std.string {
   }
 }
 
+extension std.string: ExpressibleByStringLiteral {
+  public init(stringLiteral value: String) {
+    self.init(value)
+  }
+}
+
 extension String {
   public init(cxxString: std.string) {
     self.init(cString: cxxString.__c_strUnsafe())
diff --git a/test/Interop/Cxx/stdlib/overlay/std-string-overlay.swift b/test/Interop/Cxx/stdlib/overlay/std-string-overlay.swift
@@ -16,6 +16,9 @@ StdStringOverlayTestSuite.test("std::string <=> Swift.String") {
   let cxx2 = std.string("something123")
   let swift2 = String(cxxString: cxx2)
   expectEqual(swift2, "something123")
+
+  let cxx3: std.string = "literal"
+  expectEqual(cxx3.size(), 7)
 }
 
 extension std.string.const_iterator: UnsafeCxxInputIterator {

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,12 @@ extension std.string {`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`
	`22`	`+extension std.string: ExpressibleByStringLiteral {`
	`23`	`+ public init(stringLiteral value: String) {`
	`24`	`+ self.init(value)`
	`25`	`+ }`
	`26`	`+}`
	`27`	`+`
`22`	`28`	`extension String {`
`23`	`29`	`public init(cxxString: std.string) {`
`24`	`30`	`self.init(cString: cxxString.__c_strUnsafe())`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,9 @@ StdStringOverlayTestSuite.test("std::string <=> Swift.String") {`
`16`	`16`	`let cxx2 = std.string("something123")`
`17`	`17`	`let swift2 = String(cxxString: cxx2)`
`18`	`18`	`expectEqual(swift2, "something123")`
	`19`	`+`
	`20`	`+ let cxx3: std.string = "literal"`
	`21`	`+ expectEqual(cxx3.size(), 7)`
`19`	`22`	`}`
`20`	`23`
`21`	`24`	`extension std.string.const_iterator: UnsafeCxxInputIterator {`