diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
commit | 8dd16259287f58f9273002717ec4d27e97127719 (patch) | |
tree | 3863e62a53829a84037444beab3abd4ed9dfc7d0 /third_party/rust/remote_settings/src/lib.rs | |
parent | Releasing progress-linux version 126.0.1-1~progress7.99u1. (diff) | |
download | firefox-8dd16259287f58f9273002717ec4d27e97127719.tar.xz firefox-8dd16259287f58f9273002717ec4d27e97127719.zip |
Merging upstream version 127.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'third_party/rust/remote_settings/src/lib.rs')
-rw-r--r-- | third_party/rust/remote_settings/src/lib.rs | 17 |
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"), }; |