Fix string_view referring to an out-of-scope string (#2074)

var-const · web-flow · commit 5038e26b20ee · 2018-11-13T20:04:14.000-05:00
diff --git a/Firestore/Example/Firestore.xcodeproj/xcshareddata/xcschemes/Firestore_Tests_iOS.xcscheme b/Firestore/Example/Firestore.xcodeproj/xcshareddata/xcschemes/Firestore_Tests_iOS.xcscheme
@@ -27,7 +27,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       enableASanStackUseAfterReturn = "YES"
-      enableThreadSanitizer = "YES"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
diff --git a/Firestore/Example/Tests/API/FSTAPIHelpers.mm b/Firestore/Example/Tests/API/FSTAPIHelpers.mm
@@ -20,6 +20,8 @@
 #import <FirebaseFirestore/FIRDocumentReference.h>
 #import <FirebaseFirestore/FIRSnapshotMetadata.h>
 
+#include <string>
+
 #import "Firestore/Source/API/FIRCollectionReference+Internal.h"
 #import "Firestore/Source/API/FIRDocumentReference+Internal.h"
 #import "Firestore/Source/API/FIRDocumentSnapshot+Internal.h"
@@ -102,7 +104,7 @@
                                                hasPendingWrites ? FSTDocumentStateLocalMutations
                                                                 : FSTDocumentStateSynced)];
     if (hasPendingWrites) {
-      const absl::string_view documentKey = util::StringFormat("%s/%s", path, key);
+      const std::string documentKey = util::StringFormat("%s/%s", path, key);
       mutatedKeys = mutatedKeys.insert(testutil::Key(documentKey));
     }
   }
@@ -118,7 +120,7 @@
                                 changeWithDocument:docToAdd
                                               type:FSTDocumentViewChangeTypeAdded]];
     if (hasPendingWrites) {
-      const absl::string_view documentKey = util::StringFormat("%s/%s", path, key);
+      const std::string documentKey = util::StringFormat("%s/%s", path, key);
       mutatedKeys = mutatedKeys.insert(testutil::Key(documentKey));
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@`
`20`	`20`	`#import <FirebaseFirestore/FIRDocumentReference.h>`
`21`	`21`	`#import <FirebaseFirestore/FIRSnapshotMetadata.h>`
`22`	`22`
	`23`	`+#include <string>`
	`24`	`+`
`23`	`25`	`#import "Firestore/Source/API/FIRCollectionReference+Internal.h"`
`24`	`26`	`#import "Firestore/Source/API/FIRDocumentReference+Internal.h"`
`25`	`27`	`#import "Firestore/Source/API/FIRDocumentSnapshot+Internal.h"`
`@@ -102,7 +104,7 @@`
`102`	`104`	`hasPendingWrites ? FSTDocumentStateLocalMutations`
`103`	`105`	`: FSTDocumentStateSynced)];`
`104`	`106`	`if (hasPendingWrites) {`
`105`		`- const absl::string_view documentKey = util::StringFormat("%s/%s", path, key);`
	`107`	`+ const std::string documentKey = util::StringFormat("%s/%s", path, key);`
`106`	`108`	`mutatedKeys = mutatedKeys.insert(testutil::Key(documentKey));`
`107`	`109`	`}`
`108`	`110`	`}`
`@@ -118,7 +120,7 @@`
`118`	`120`	`changeWithDocument:docToAdd`
`119`	`121`	`type:FSTDocumentViewChangeTypeAdded]];`
`120`	`122`	`if (hasPendingWrites) {`
`121`		`- const absl::string_view documentKey = util::StringFormat("%s/%s", path, key);`
	`123`	`+ const std::string documentKey = util::StringFormat("%s/%s", path, key);`
`122`	`124`	`mutatedKeys = mutatedKeys.insert(testutil::Key(documentKey));`
`123`	`125`	`}`
`124`	`126`	`}`