Adding upstream version 127.0.upstream/127.0

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 13 insertions, 4 deletions

diff --git a/third_party/rust/remote_settings/src/lib.rs b/third_party/rust/remote_settings/src/lib.rs
index 9aa6ecbf1a..9380a3fbc7 100644
--- a/third_party/rust/remote_settings/src/lib.rs
+++ b/third_party/rust/remote_settings/src/lib.rs
@@ -11,7 +11,7 @@ pub use client::{
     RsJsonObject, SortOrder,
 };
 pub mod config;
-pub use config::RemoteSettingsConfig;
+pub use config::{RemoteSettingsConfig, RemoteSettingsServer};
 
 uniffi::include_scaffolding!("remote_settings");
 
@@ -70,7 +70,10 @@ mod test {
         .create();
 
         let config = RemoteSettingsConfig {
-            server_url: Some(mockito::server_url()),
+            server: Some(RemoteSettingsServer::Custom {
+                url: mockito::server_url(),
+            }),
+            server_url: None,
             bucket_name: Some(String::from("the-bucket")),
             collection_name: String::from("the-collection"),
         };
@@ -98,7 +101,10 @@ mod test {
         .create();
 
         let config = RemoteSettingsConfig {
-            server_url: Some(mockito::server_url()),
+            server: Some(RemoteSettingsServer::Custom {
+                url: mockito::server_url(),
+            }),
+            server_url: None,
             bucket_name: Some(String::from("the-bucket")),
             collection_name: String::from("the-collection"),
         };
@@ -119,7 +125,10 @@ mod test {
     fn test_download() {
         viaduct_reqwest::use_reqwest_backend();
         let config = RemoteSettingsConfig {
-            server_url: Some("http://localhost:8888".to_string()),
+            server: Some(RemoteSettingsServer::Custom {
+                url: "http://localhost:8888".into(),
+            }),
+            server_url: None,
             bucket_name: Some(String::from("the-bucket")),
             collection_name: String::from("the-collection"),
         };