tor-browser

commit 4d32532f512840ad040da8c0845181c8fbff6d63
parent dcba17f7d9d8835cfaa94d2cd9d8e005db0487ff
Author: Johannes Schmidt <joschmidt@mozilla.com>
Date:   Tue,  7 Oct 2025 09:23:41 +0000

Bug 1992767 - Update Appplication Services r=dimi

Differential Revision: https://phabricator.services.mozilla.com/D267632

Diffstat:
M
.cargo/config.toml.in
 | 
4
++--
M
Cargo.lock
 | 
38
+++++++++++++++++++-------------------
M
Cargo.toml
 | 
26
+++++++++++++-------------
M
third_party/rust/context_id/.cargo-checksum.json
 | 
4
++--
M
third_party/rust/context_id/src/lib.rs
 | 
1
-
M
third_party/rust/tracing-support/.cargo-checksum.json
 | 
4
++--
M
third_party/rust/tracing-support/src/filters.rs
 | 
6
------

7 files changed, 38 insertions(+), 45 deletions(-)
diff --git a/.cargo/config.toml.in b/.cargo/config.toml.in
@@ -80,9 +80,9 @@ git = "https://github.com/martinthomson/ohttp.git"
 rev = "bf6a983845cc0b540effb3a615e92d914dfcfd0b"
 replace-with = "vendored-sources"
 
-[source."git+https://github.com/mozilla/application-services?rev=f6f667f590ac15367fc37eb1ad3a6bdea4ffc526"]
+[source."git+https://github.com/mozilla/application-services?rev=cd04a4d1a74294ab08434d7a5a8152d25d25e53c"]
 git = "https://github.com/mozilla/application-services"
-rev = "f6f667f590ac15367fc37eb1ad3a6bdea4ffc526"
+rev = "cd04a4d1a74294ab08434d7a5a8152d25d25e53c"
 replace-with = "vendored-sources"
 
 [source."git+https://github.com/mozilla/audioipc?rev=82fe7fa7e3aaa35468137239a0e4c2f867457214"]
diff --git a/Cargo.lock b/Cargo.lock
@@ -973,7 +973,7 @@ dependencies = [
 [[package]]
 name = "context_id"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=f6f667f590ac15367fc37eb1ad3a6bdea4ffc526#f6f667f590ac15367fc37eb1ad3a6bdea4ffc526"
+source = "git+https://github.com/mozilla/application-services?rev=cd04a4d1a74294ab08434d7a5a8152d25d25e53c#cd04a4d1a74294ab08434d7a5a8152d25d25e53c"
 dependencies = [
  "chrono",
  "error-support",
@@ -1898,7 +1898,7 @@ dependencies = [
 [[package]]
 name = "error-support"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=f6f667f590ac15367fc37eb1ad3a6bdea4ffc526#f6f667f590ac15367fc37eb1ad3a6bdea4ffc526"
+source = "git+https://github.com/mozilla/application-services?rev=cd04a4d1a74294ab08434d7a5a8152d25d25e53c#cd04a4d1a74294ab08434d7a5a8152d25d25e53c"
 dependencies = [
  "env_logger",
  "error-support-macros",
@@ -1913,7 +1913,7 @@ dependencies = [
 [[package]]
 name = "error-support-macros"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=f6f667f590ac15367fc37eb1ad3a6bdea4ffc526#f6f667f590ac15367fc37eb1ad3a6bdea4ffc526"
+source = "git+https://github.com/mozilla/application-services?rev=cd04a4d1a74294ab08434d7a5a8152d25d25e53c#cd04a4d1a74294ab08434d7a5a8152d25d25e53c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2008,7 +2008,7 @@ dependencies = [
 [[package]]
 name = "filter_adult"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=f6f667f590ac15367fc37eb1ad3a6bdea4ffc526#f6f667f590ac15367fc37eb1ad3a6bdea4ffc526"
+source = "git+https://github.com/mozilla/application-services?rev=cd04a4d1a74294ab08434d7a5a8152d25d25e53c#cd04a4d1a74294ab08434d7a5a8152d25d25e53c"
 dependencies = [
  "base64 0.22.1",
  "error-support",
@@ -2044,7 +2044,7 @@ dependencies = [
 [[package]]
 name = "firefox-versioning"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=f6f667f590ac15367fc37eb1ad3a6bdea4ffc526#f6f667f590ac15367fc37eb1ad3a6bdea4ffc526"
+source = "git+https://github.com/mozilla/application-services?rev=cd04a4d1a74294ab08434d7a5a8152d25d25e53c#cd04a4d1a74294ab08434d7a5a8152d25d25e53c"
 dependencies = [
  "serde_json",
  "thiserror 2.0.12",
@@ -3394,7 +3394,7 @@ dependencies = [
 [[package]]
 name = "interrupt-support"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=f6f667f590ac15367fc37eb1ad3a6bdea4ffc526#f6f667f590ac15367fc37eb1ad3a6bdea4ffc526"
+source = "git+https://github.com/mozilla/application-services?rev=cd04a4d1a74294ab08434d7a5a8152d25d25e53c#cd04a4d1a74294ab08434d7a5a8152d25d25e53c"
 dependencies = [
  "lazy_static",
  "parking_lot",
@@ -5184,7 +5184,7 @@ checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba"
 [[package]]
 name = "payload-support"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=f6f667f590ac15367fc37eb1ad3a6bdea4ffc526#f6f667f590ac15367fc37eb1ad3a6bdea4ffc526"
+source = "git+https://github.com/mozilla/application-services?rev=cd04a4d1a74294ab08434d7a5a8152d25d25e53c#cd04a4d1a74294ab08434d7a5a8152d25d25e53c"
 dependencies = [
  "serde",
  "serde_derive",
@@ -5753,7 +5753,7 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 [[package]]
 name = "relevancy"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=f6f667f590ac15367fc37eb1ad3a6bdea4ffc526#f6f667f590ac15367fc37eb1ad3a6bdea4ffc526"
+source = "git+https://github.com/mozilla/application-services?rev=cd04a4d1a74294ab08434d7a5a8152d25d25e53c#cd04a4d1a74294ab08434d7a5a8152d25d25e53c"
 dependencies = [
  "anyhow",
  "base64 0.21.999",
@@ -5777,7 +5777,7 @@ dependencies = [
 [[package]]
 name = "remote_settings"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=f6f667f590ac15367fc37eb1ad3a6bdea4ffc526#f6f667f590ac15367fc37eb1ad3a6bdea4ffc526"
+source = "git+https://github.com/mozilla/application-services?rev=cd04a4d1a74294ab08434d7a5a8152d25d25e53c#cd04a4d1a74294ab08434d7a5a8152d25d25e53c"
 dependencies = [
  "anyhow",
  "camino",
@@ -6062,7 +6062,7 @@ dependencies = [
 [[package]]
 name = "search"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=f6f667f590ac15367fc37eb1ad3a6bdea4ffc526#f6f667f590ac15367fc37eb1ad3a6bdea4ffc526"
+source = "git+https://github.com/mozilla/application-services?rev=cd04a4d1a74294ab08434d7a5a8152d25d25e53c#cd04a4d1a74294ab08434d7a5a8152d25d25e53c"
 dependencies = [
  "error-support",
  "firefox-versioning",
@@ -6366,7 +6366,7 @@ dependencies = [
 [[package]]
 name = "sql-support"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=f6f667f590ac15367fc37eb1ad3a6bdea4ffc526#f6f667f590ac15367fc37eb1ad3a6bdea4ffc526"
+source = "git+https://github.com/mozilla/application-services?rev=cd04a4d1a74294ab08434d7a5a8152d25d25e53c#cd04a4d1a74294ab08434d7a5a8152d25d25e53c"
 dependencies = [
  "error-support",
  "interrupt-support",
@@ -6557,7 +6557,7 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
 [[package]]
 name = "suggest"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=f6f667f590ac15367fc37eb1ad3a6bdea4ffc526#f6f667f590ac15367fc37eb1ad3a6bdea4ffc526"
+source = "git+https://github.com/mozilla/application-services?rev=cd04a4d1a74294ab08434d7a5a8152d25d25e53c#cd04a4d1a74294ab08434d7a5a8152d25d25e53c"
 dependencies = [
  "anyhow",
  "chrono",
@@ -6610,7 +6610,7 @@ dependencies = [
 [[package]]
 name = "sync-guid"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=f6f667f590ac15367fc37eb1ad3a6bdea4ffc526#f6f667f590ac15367fc37eb1ad3a6bdea4ffc526"
+source = "git+https://github.com/mozilla/application-services?rev=cd04a4d1a74294ab08434d7a5a8152d25d25e53c#cd04a4d1a74294ab08434d7a5a8152d25d25e53c"
 dependencies = [
  "base64 0.21.999",
  "rand",
@@ -6621,7 +6621,7 @@ dependencies = [
 [[package]]
 name = "sync15"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=f6f667f590ac15367fc37eb1ad3a6bdea4ffc526#f6f667f590ac15367fc37eb1ad3a6bdea4ffc526"
+source = "git+https://github.com/mozilla/application-services?rev=cd04a4d1a74294ab08434d7a5a8152d25d25e53c#cd04a4d1a74294ab08434d7a5a8152d25d25e53c"
 dependencies = [
  "anyhow",
  "error-support",
@@ -6660,7 +6660,7 @@ dependencies = [
 [[package]]
 name = "tabs"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=f6f667f590ac15367fc37eb1ad3a6bdea4ffc526#f6f667f590ac15367fc37eb1ad3a6bdea4ffc526"
+source = "git+https://github.com/mozilla/application-services?rev=cd04a4d1a74294ab08434d7a5a8152d25d25e53c#cd04a4d1a74294ab08434d7a5a8152d25d25e53c"
 dependencies = [
  "anyhow",
  "error-support",
@@ -6973,7 +6973,7 @@ dependencies = [
 [[package]]
 name = "tracing-support"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=f6f667f590ac15367fc37eb1ad3a6bdea4ffc526#f6f667f590ac15367fc37eb1ad3a6bdea4ffc526"
+source = "git+https://github.com/mozilla/application-services?rev=cd04a4d1a74294ab08434d7a5a8152d25d25e53c#cd04a4d1a74294ab08434d7a5a8152d25d25e53c"
 dependencies = [
  "parking_lot",
  "serde_json",
@@ -7039,7 +7039,7 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
 [[package]]
 name = "types"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=f6f667f590ac15367fc37eb1ad3a6bdea4ffc526#f6f667f590ac15367fc37eb1ad3a6bdea4ffc526"
+source = "git+https://github.com/mozilla/application-services?rev=cd04a4d1a74294ab08434d7a5a8152d25d25e53c#cd04a4d1a74294ab08434d7a5a8152d25d25e53c"
 dependencies = [
  "rusqlite 0.37.0",
  "serde",
@@ -7437,7 +7437,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 [[package]]
 name = "viaduct"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=f6f667f590ac15367fc37eb1ad3a6bdea4ffc526#f6f667f590ac15367fc37eb1ad3a6bdea4ffc526"
+source = "git+https://github.com/mozilla/application-services?rev=cd04a4d1a74294ab08434d7a5a8152d25d25e53c#cd04a4d1a74294ab08434d7a5a8152d25d25e53c"
 dependencies = [
  "async-trait",
  "error-support",
@@ -7602,7 +7602,7 @@ dependencies = [
 [[package]]
 name = "webext-storage"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=f6f667f590ac15367fc37eb1ad3a6bdea4ffc526#f6f667f590ac15367fc37eb1ad3a6bdea4ffc526"
+source = "git+https://github.com/mozilla/application-services?rev=cd04a4d1a74294ab08434d7a5a8152d25d25e53c#cd04a4d1a74294ab08434d7a5a8152d25d25e53c"
 dependencies = [
  "anyhow",
  "error-support",
diff --git a/Cargo.toml b/Cargo.toml
@@ -264,19 +264,19 @@ ohttp = { git = "https://github.com/martinthomson/ohttp.git", rev = "bf6a983845c
 bhttp = { git = "https://github.com/martinthomson/ohttp.git", rev = "bf6a983845cc0b540effb3a615e92d914dfcfd0b" }
 
 # application-services overrides to make updating them all simpler.
-context_id = { git = "https://github.com/mozilla/application-services", rev = "f6f667f590ac15367fc37eb1ad3a6bdea4ffc526" }
-error-support = { git = "https://github.com/mozilla/application-services", rev = "f6f667f590ac15367fc37eb1ad3a6bdea4ffc526" }
-filter_adult = { git = "https://github.com/mozilla/application-services", rev = "f6f667f590ac15367fc37eb1ad3a6bdea4ffc526" }
-interrupt-support = { git = "https://github.com/mozilla/application-services", rev = "f6f667f590ac15367fc37eb1ad3a6bdea4ffc526" }
-relevancy = { git = "https://github.com/mozilla/application-services", rev = "f6f667f590ac15367fc37eb1ad3a6bdea4ffc526" }
-search = { git = "https://github.com/mozilla/application-services", rev = "f6f667f590ac15367fc37eb1ad3a6bdea4ffc526" }
-sql-support = { git = "https://github.com/mozilla/application-services", rev = "f6f667f590ac15367fc37eb1ad3a6bdea4ffc526" }
-suggest = { git = "https://github.com/mozilla/application-services", rev = "f6f667f590ac15367fc37eb1ad3a6bdea4ffc526" }
-sync15 = { git = "https://github.com/mozilla/application-services", rev = "f6f667f590ac15367fc37eb1ad3a6bdea4ffc526" }
-tabs = { git = "https://github.com/mozilla/application-services", rev = "f6f667f590ac15367fc37eb1ad3a6bdea4ffc526" }
-tracing-support = { git = "https://github.com/mozilla/application-services", rev = "f6f667f590ac15367fc37eb1ad3a6bdea4ffc526" }
-viaduct = { git = "https://github.com/mozilla/application-services", rev = "f6f667f590ac15367fc37eb1ad3a6bdea4ffc526" }
-webext-storage = { git = "https://github.com/mozilla/application-services", rev = "f6f667f590ac15367fc37eb1ad3a6bdea4ffc526" }
+context_id = { git = "https://github.com/mozilla/application-services", rev = "cd04a4d1a74294ab08434d7a5a8152d25d25e53c" }
+error-support = { git = "https://github.com/mozilla/application-services", rev = "cd04a4d1a74294ab08434d7a5a8152d25d25e53c" }
+filter_adult = { git = "https://github.com/mozilla/application-services", rev = "cd04a4d1a74294ab08434d7a5a8152d25d25e53c" }
+interrupt-support = { git = "https://github.com/mozilla/application-services", rev = "cd04a4d1a74294ab08434d7a5a8152d25d25e53c" }
+relevancy = { git = "https://github.com/mozilla/application-services", rev = "cd04a4d1a74294ab08434d7a5a8152d25d25e53c" }
+search = { git = "https://github.com/mozilla/application-services", rev = "cd04a4d1a74294ab08434d7a5a8152d25d25e53c" }
+sql-support = { git = "https://github.com/mozilla/application-services", rev = "cd04a4d1a74294ab08434d7a5a8152d25d25e53c" }
+suggest = { git = "https://github.com/mozilla/application-services", rev = "cd04a4d1a74294ab08434d7a5a8152d25d25e53c" }
+sync15 = { git = "https://github.com/mozilla/application-services", rev = "cd04a4d1a74294ab08434d7a5a8152d25d25e53c" }
+tabs = { git = "https://github.com/mozilla/application-services", rev = "cd04a4d1a74294ab08434d7a5a8152d25d25e53c" }
+tracing-support = { git = "https://github.com/mozilla/application-services", rev = "cd04a4d1a74294ab08434d7a5a8152d25d25e53c" }
+viaduct = { git = "https://github.com/mozilla/application-services", rev = "cd04a4d1a74294ab08434d7a5a8152d25d25e53c" }
+webext-storage = { git = "https://github.com/mozilla/application-services", rev = "cd04a4d1a74294ab08434d7a5a8152d25d25e53c" }
 
 # Patched version of zip 2.4.2 to allow for reading omnijars.
 zip = { path = "third_party/rust/zip" }
diff --git a/third_party/rust/context_id/.cargo-checksum.json b/third_party/rust/context_id/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"ef652383889181c9e31c6f59b7726acc1d36767dd8f55e28aa38b1b630c54841","README.md":"478bd3dcd41863df0975c96fd38e34334d8146799bf1a16204bab2cc12dcffd2","src/callback.rs":"1e18555c60cc29eeaa31faabd25e0dd18cd3103bea65c2a4f558ed392dc8f7d0","src/error.rs":"434abbc9f803242bab3d6f83d43115e11ae361a71bd0279c407132ac99128265","src/lib.rs":"1bf99006f9fcdc1c444c12052c52e795bbf05164a61efb2ac949716af5b376ec","src/mars.rs":"96d0a8767de2260821b14e2ec913857bfbf1a9c131a567fbdaf367397c36e231","uniffi.toml":"02d52578b859174a22728da6d6b546d94faa435866e94ac035f975d4a2ac6f5a"},"package":null}
-\ No newline at end of file
+{"files":{"Cargo.toml":"ef652383889181c9e31c6f59b7726acc1d36767dd8f55e28aa38b1b630c54841","README.md":"478bd3dcd41863df0975c96fd38e34334d8146799bf1a16204bab2cc12dcffd2","src/callback.rs":"1e18555c60cc29eeaa31faabd25e0dd18cd3103bea65c2a4f558ed392dc8f7d0","src/error.rs":"434abbc9f803242bab3d6f83d43115e11ae361a71bd0279c407132ac99128265","src/lib.rs":"53c7790a585f8eef9511dc9e4a6bdd65805f827019fb5b952cc26f9f8e96f06f","src/mars.rs":"96d0a8767de2260821b14e2ec913857bfbf1a9c131a567fbdaf367397c36e231","uniffi.toml":"02d52578b859174a22728da6d6b546d94faa435866e94ac035f975d4a2ac6f5a"},"package":null}
+\ No newline at end of file
diff --git a/third_party/rust/context_id/src/lib.rs b/third_party/rust/context_id/src/lib.rs
@@ -31,7 +31,6 @@ impl ContextIDComponent {
     ///
     /// If no creation timestamp is provided, the current time will be used.
     #[uniffi::constructor]
-
     pub fn new(
         init_context_id: &str,
         creation_timestamp_s: i64,
diff --git a/third_party/rust/tracing-support/.cargo-checksum.json b/third_party/rust/tracing-support/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"a70b253ae9ed4a9d8f5a87f05f269f0b12775ba5705a638edb6316970f7e5c03","android/build.gradle":"7eb3991c22ae47043c9754db53091493192a76ca4709f040a13aa8b5cd5bc64f","android/src/main/AndroidManifest.xml":"0edcec96c2345be661da3ead2714e059418ff5154123509923c344b66b4890c1","src/filters.rs":"eaca73c89233ff86e8ef201d0961c37debaf5a1433fad0db1f62bb9e53680ee4","src/layer.rs":"bc447375b405c3e4686f11f61113a42c23371f81472c65123e5d164b0c75c18f","src/lib.rs":"f6c8b4ffbe95488e150a51563ac98d2dba2ba9cd08376a75363503c536c4a85b","uniffi.toml":"357c46607bdec389b533ea0a908d98586b3fa2b6de2fa6263ca6903d13156f30"},"package":null}
-\ No newline at end of file
+{"files":{"Cargo.toml":"a70b253ae9ed4a9d8f5a87f05f269f0b12775ba5705a638edb6316970f7e5c03","android/build.gradle":"7eb3991c22ae47043c9754db53091493192a76ca4709f040a13aa8b5cd5bc64f","android/src/main/AndroidManifest.xml":"0edcec96c2345be661da3ead2714e059418ff5154123509923c344b66b4890c1","src/filters.rs":"8d15290905b251bd713f9fdb0513b23898e2f8015d65920ffc90e02bfa784ce0","src/layer.rs":"bc447375b405c3e4686f11f61113a42c23371f81472c65123e5d164b0c75c18f","src/lib.rs":"f6c8b4ffbe95488e150a51563ac98d2dba2ba9cd08376a75363503c536c4a85b","uniffi.toml":"357c46607bdec389b533ea0a908d98586b3fa2b6de2fa6263ca6903d13156f30"},"package":null}
+\ No newline at end of file
diff --git a/third_party/rust/tracing-support/src/filters.rs b/third_party/rust/tracing-support/src/filters.rs
@@ -14,8 +14,6 @@ use tracing_subscriber::{
 /// See `build_targets_from_env` for the exact behavior.  If not so configured, the filter will
 /// default to the `Level::Error` level.
 pub fn init_from_env() {
-    // This is intended to be equivalent to `env_logger::try_init().ok();`
-    // `debug!()` output is seen. We could maybe add logging for `#[tracing::instrument]`?
     tracing_subscriber::registry()
         .with(fmt::layer())
         .with(build_targets_from_env(LevelFilter::ERROR, None))
@@ -25,8 +23,6 @@ pub fn init_from_env() {
 /// Like `init_for_tests` but uses the specified `level` if logging is not configured in the environment.
 pub fn init_from_env_with_level(level: crate::Level) {
     let level_filter = LevelFilter::from_level(level.into());
-    // This is intended to be equivalent to `env_logger::try_init().ok();`
-    // `debug!()` output is seen. We could maybe add logging for `#[tracing::instrument]`?
     tracing_subscriber::registry()
         .with(fmt::layer())
         .with(build_targets_from_env(level_filter, None))
@@ -35,8 +31,6 @@ pub fn init_from_env_with_level(level: crate::Level) {
 
 /// Like `init_for_tests` but uses a default string if logging is not configured in the environment
 pub fn init_from_env_with_default(default_env: &str) {
-    // This is intended to be equivalent to `env_logger::try_init().ok();`
-    // `debug!()` output is seen. We could maybe add logging for `#[tracing::instrument]`?
     tracing_subscriber::registry()
         .with(fmt::layer())
         .with(build_targets_from_env(LevelFilter::OFF, Some(default_env)))