Uri: switch to std::string over fbstring take 2

Summary: Update tuple generated for hash/equal_to for `folly::Uri` to also use std::string

Reviewed By: Orvid

Differential Revision: D5199266

fbshipit-source-id: bcd619dae01ffbf82fbb5c8987b0e87103572452

diff --git a/folly/Uri-inl.h b/folly/Uri-inl.h
index 86a63a0cd95d08adb11132e88c2157774907df6f..6445eef36b4af5672152a95220e0f725821358c4 100644 (file)
--- a/folly/Uri-inl.h
+++ b/folly/Uri-inl.h
@@ -29,14 +29,14 @@ namespace folly {
 namespace uri_detail {
 
 using UriTuple = std::tuple<
-    const fbstring&,
-    const fbstring&,
-    const fbstring&,
-    const fbstring&,
+    const std::string&,
+    const std::string&,
+    const std::string&,
+    const std::string&,
     uint16_t,
-    const fbstring&,
-    const fbstring&,
-    const fbstring&>;
+    const std::string&,
+    const std::string&,
+    const std::string&>;
 
 inline UriTuple as_tuple(const folly::Uri& k) {
   return UriTuple(