averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

More StringRef -> std::string conversion fixes.

Browse Source 
This is needed for the master-next branch.
This commit is contained in:
Michael Forster
2020-04-20 09:18:57 +02:00
parent ad967ddd98
commit 00b09c723c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/swift-api-digester/swift-api-digester.cpp
View File

@@ -2676,13 +2676,13 @@ static std::string getDefaultBaselineDir(const char *Main) {
llvm::sys::path::remove_filename(BaselineDir); // Remove /swift-api-digester llvm::sys::path::remove_filename(BaselineDir); // Remove /swift-api-digester
llvm::sys::path::remove_filename(BaselineDir); // Remove /bin llvm::sys::path::remove_filename(BaselineDir); // Remove /bin
llvm::sys::path::append(BaselineDir, "lib", "swift", "FrameworkABIBaseline"); llvm::sys::path::append(BaselineDir, "lib", "swift", "FrameworkABIBaseline");
return BaselineDir.str(); return BaselineDir.str().str();
} }
static std::string getEmptyBaselinePath(const char *Main) { static std::string getEmptyBaselinePath(const char *Main) {
llvm::SmallString<128> BaselinePath(getDefaultBaselineDir(Main)); llvm::SmallString<128> BaselinePath(getDefaultBaselineDir(Main));
llvm::sys::path::append(BaselinePath, "nil.json"); llvm::sys::path::append(BaselinePath, "nil.json");
return BaselinePath.str(); return BaselinePath.str().str();
} }
static StringRef getBaselineFilename(llvm::Triple Triple) { static StringRef getBaselineFilename(llvm::Triple Triple) {
@@ -2710,13 +2710,13 @@ static std::string getDefaultBaselinePath(const char *Main, StringRef Module,
// Look for ABI or API baseline // Look for ABI or API baseline
llvm::sys::path::append(BaselinePath, ABI? "ABI": "API"); llvm::sys::path::append(BaselinePath, ABI? "ABI": "API");
llvm::sys::path::append(BaselinePath, getBaselineFilename(Triple)); llvm::sys::path::append(BaselinePath, getBaselineFilename(Triple));
return BaselinePath.str(); return BaselinePath.str().str();
} }
static std::string getCustomBaselinePath(llvm::Triple Triple) { static std::string getCustomBaselinePath(llvm::Triple Triple) {
llvm::SmallString<128> BaselinePath(options::BaselineDirPath); llvm::SmallString<128> BaselinePath(options::BaselineDirPath);
llvm::sys::path::append(BaselinePath, getBaselineFilename(Triple)); llvm::sys::path::append(BaselinePath, getBaselineFilename(Triple));
return BaselinePath.str(); return BaselinePath.str().str();
} }
static SDKNodeRoot *getBaselineFromJson(const char *Main, SDKContext &Ctx) { static SDKNodeRoot *getBaselineFromJson(const char *Main, SDKContext &Ctx) {