Skip to content

Commit 89f4636

Browse files
committed
Bug 2049856 - Remove old viaduct backend code
* Removed the old `backend` and `backend::ffi` modules * Renamed `new_backend` to `backend`. Changed the default timeout for `viaduct::Client` to 7 seconds for iOS and 10 seconds otherwise. This matches the behavior of we had for `Request::send()`. Should we make these longer? Also: * Fixed build errors when crates depend on viaduct with the ohttp feature, but not rusqlite. * removed viaduct-reqwest which was no longer used. * Removed un-used protobuf code.
1 parent d0a2355 commit 89f4636

28 files changed

Lines changed: 73 additions & 1101 deletions

File tree

Cargo.lock

Lines changed: 1 addition & 110 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ members = [
5353
"components/support/url-macro/tests",
5454
"components/support/viaduct-dev",
5555
"components/support/viaduct-hyper",
56-
"components/support/viaduct-reqwest",
5756
"components/sync_manager",
5857
"components/sync15",
5958
"components/tabs",
@@ -139,7 +138,6 @@ default-members = [
139138
"components/support/types",
140139
"components/support/url-macro",
141140
"components/support/url-macro/tests",
142-
"components/support/viaduct-reqwest",
143141
"components/sync_manager",
144142
"components/sync15",
145143
"components/tabs",

DEPENDENCIES.md

Lines changed: 0 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ the details of which are reproduced below.
3737
* [MIT License: try-lock](#mit-license-try-lock)
3838
* [MIT License: want](#mit-license-want)
3939
* [MIT License: weedle2](#mit-license-weedle2)
40-
* [MIT License: winreg](#mit-license-winreg)
4140
* [MIT License: xshell-venv](#mit-license-xshell-venv)
4241
* [CC0-1.0 License: base16](#cc0-10-license-base16)
4342
* [ISC License: libloading](#isc-license-libloading)
@@ -49,7 +48,6 @@ the details of which are reproduced below.
4948
* [Unicode-3.0 License: icu_casemap, icu_casemap_data, icu_collections, icu_locale, icu_locale_core, icu_locale_data, icu_normalizer, icu_normalizer_data, icu_properties, icu_properties_data, icu_provider, icu_segmenter, icu_segmenter_data, litemap, potential_utf, tinystr, writeable, yoke, yoke-derive, zerofrom, zerofrom-derive, zerotrie, zerovec, zerovec-derive](#unicode-30-license-icu_casemap-icu_casemap_data-icu_collections-icu_locale-icu_locale_core-icu_locale_data-icu_normalizer-icu_normalizer_data-icu_properties-icu_properties_data-icu_provider-icu_segmenter-icu_segmenter_data-litemap-potential_utf-tinystr-writeable-yoke-yoke-derive-zerofrom-zerofrom-derive-zerotrie-zerovec-zerovec-derive)
5049
* [OpenSSL License](#openssl-license)
5150
* [Optional Notice: SQLite](#optional-notice-sqlite)
52-
* [(Apache-2.0 OR MIT) AND BSD-3-Clause License: encoding_rs](#(apache-20-or-mit)-and-bsd-3-clause-license-encoding_rs)
5351
* [(MIT OR Apache-2.0) AND Unicode-3.0 License: unicode-ident](#(mit-or-apache-20)-and-unicode-30-license-unicode-ident)
5452
-------------
5553
## Mozilla Public License 2.0
@@ -496,7 +494,6 @@ The following text applies to code linked from these dependencies:
496494
[fs-err](https://github.com/andrewhickman/fs-err),
497495
[futures-channel](https://github.com/rust-lang/futures-rs),
498496
[futures-core](https://github.com/rust-lang/futures-rs),
499-
[futures-io](https://github.com/rust-lang/futures-rs),
500497
[futures-sink](https://github.com/rust-lang/futures-rs),
501498
[futures-task](https://github.com/rust-lang/futures-rs),
502499
[futures-util](https://github.com/rust-lang/futures-rs),
@@ -516,7 +513,6 @@ The following text applies to code linked from these dependencies:
516513
[idna_adapter](https://github.com/hsivonen/idna_adapter),
517514
[indexmap](https://github.com/indexmap-rs/indexmap),
518515
[io-lifetimes](https://github.com/sunfishcode/io-lifetimes),
519-
[ipnet](https://github.com/krisprice/ipnet),
520516
[itertools](https://github.com/rust-itertools/itertools),
521517
[itoa](https://github.com/dtolnay/itoa),
522518
[jna](https://github.com/java-native-access/jna),
@@ -527,7 +523,6 @@ The following text applies to code linked from these dependencies:
527523
[linux-raw-sys](https://github.com/sunfishcode/linux-raw-sys),
528524
[lock_api](https://github.com/Amanieu/parking_lot),
529525
[log](https://github.com/rust-lang/log),
530-
[mime](https://github.com/hyperium/mime),
531526
[minimal-lexical](https://github.com/Alexhuszagh/minimal-lexical),
532527
[native-tls](https://github.com/sfackler/rust-native-tls),
533528
[num-traits](https://github.com/rust-num/num-traits),
@@ -548,16 +543,13 @@ The following text applies to code linked from these dependencies:
548543
[pollster](https://github.com/zesterer/pollster),
549544
[ppv-lite86](https://github.com/cryptocorrosion/cryptocorrosion),
550545
[proc-macro2](https://github.com/dtolnay/proc-macro2),
551-
[prost-derive](https://github.com/tokio-rs/prost),
552-
[prost](https://github.com/tokio-rs/prost),
553546
[quote](https://github.com/dtolnay/quote),
554547
[rand](https://github.com/rust-random/rand),
555548
[rand_chacha](https://github.com/rust-random/rand),
556549
[rand_core](https://github.com/rust-random/rand),
557550
[regex-automata](https://github.com/rust-lang/regex/tree/master/regex-automata),
558551
[regex-syntax](https://github.com/rust-lang/regex/tree/master/regex-syntax),
559552
[regex](https://github.com/rust-lang/regex),
560-
[reqwest](https://github.com/seanmonstar/reqwest),
561553
[rkv](https://github.com/mozilla/rkv),
562554
[rustc-hash](https://github.com/rust-lang/rustc-hash),
563555
[rustix](https://github.com/bytecodealliance/rustix),
@@ -572,7 +564,6 @@ The following text applies to code linked from these dependencies:
572564
[serde_json](https://github.com/serde-rs/json),
573565
[serde_path_to_error](https://github.com/dtolnay/path-to-error),
574566
[serde_spanned](https://github.com/toml-rs/toml),
575-
[serde_urlencoded](https://github.com/nox/serde_urlencoded),
576567
[sha2](https://github.com/RustCrypto/hashes),
577568
[shlex](https://github.com/comex/rust-shlex),
578569
[siphasher](https://github.com/jedisct1/rust-siphash),
@@ -1743,34 +1734,6 @@ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABI
17431734
CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
17441735
DEALINGS IN THE SOFTWARE.
17451736
1746-
```
1747-
-------------
1748-
## MIT License: winreg
1749-
1750-
The following text applies to code linked from these dependencies:
1751-
[winreg](https://github.com/gentoo90/winreg-rs)
1752-
1753-
```
1754-
Copyright (c) 2015 Igor Shaula
1755-
1756-
Permission is hereby granted, free of charge, to any person obtaining a copy
1757-
of this software and associated documentation files (the "Software"), to deal
1758-
in the Software without restriction, including without limitation the rights
1759-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
1760-
copies of the Software, and to permit persons to whom the Software is
1761-
furnished to do so, subject to the following conditions:
1762-
1763-
The above copyright notice and this permission notice shall be included in
1764-
all copies or substantial portions of the Software.
1765-
1766-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
1767-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
1768-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
1769-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1770-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
1771-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
1772-
THE SOFTWARE.
1773-
17741737
```
17751738
-------------
17761739
## MIT License: xshell-venv
@@ -2418,32 +2381,6 @@ The following text applies to code linked from these dependencies:
24182381

24192382
```
24202383
This software makes use of the 'SQLite' database engine, and we are very grateful to D. Richard Hipp and team for producing it.
2421-
```
2422-
-------------
2423-
## (Apache-2.0 OR MIT) AND BSD-3-Clause License: encoding_rs
2424-
2425-
The following text applies to code linked from these dependencies:
2426-
[encoding_rs](https://github.com/hsivonen/encoding_rs)
2427-
2428-
```
2429-
encoding_rs is copyright Mozilla Foundation.
2430-
2431-
Licensed under the Apache License, Version 2.0
2432-
<LICENSE-APACHE or
2433-
https://www.apache.org/licenses/LICENSE-2.0> or the MIT
2434-
license <LICENSE-MIT or https://opensource.org/licenses/MIT>,
2435-
at your option. All files in the project carrying such
2436-
notice may not be copied, modified, or distributed except
2437-
according to those terms.
2438-
2439-
This crate includes data derived from the data files supplied
2440-
with the WHATWG Encoding Standard, which, when incorporated into
2441-
source code, are licensed under the BSD 3-Clause License
2442-
<LICENSE-WHATWG>.
2443-
2444-
Test code within encoding_rs is dedicated to the Public Domain when so
2445-
designated (see the individual files for PD/CC0-dedicated sections).
2446-
24472384
```
24482385
-------------
24492386
## (MIT OR Apache-2.0) AND Unicode-3.0 License: unicode-ident

components/support/viaduct-reqwest/Cargo.toml

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)