зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1765326 - Update clap and other dependencies to avoid duplication. r=jnicol
The duplications arise from a Glean update, which has some of those as transitive dependencies. Upgrading Clap and others here reduces the duplication. Differential Revision: https://phabricator.services.mozilla.com/D147659
This commit is contained in:
Jan-Erik Rediger
Родитель
5c0d663676
Коммит
9f36df3eb8
|
|
@ -36,20 +36,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
checksum = "d9ed09b18365ed295d722d0b5ed59c01b79a826ff2d2a8f73d5ecca8e6fb2f66"
|
||||
dependencies = [
|
||||
"android_log-sys",
|
||||
"env_logger 0.8.4",
|
||||
"env_logger",
|
||||
"lazy_static",
|
||||
"log",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ansi_term"
|
||||
version = "0.11.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
|
||||
dependencies = [
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "anyhow"
|
||||
version = "1.0.57"
|
||||
|
|
@ -251,8 +242,8 @@ checksum = "081e3f0755c1f380c2d010481b6fa2e02973586d5f2b24eebb7a2a1d98b143d8"
|
|||
dependencies = [
|
||||
"camino",
|
||||
"cargo-platform",
|
||||
"semver 0.11.0",
|
||||
"semver-parser 0.10.2",
|
||||
"semver",
|
||||
"semver-parser",
|
||||
"serde",
|
||||
"serde_json",
|
||||
]
|
||||
|
|
@ -301,22 +292,6 @@ dependencies = [
|
|||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "clap"
|
||||
version = "2.33.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
|
||||
dependencies = [
|
||||
"ansi_term",
|
||||
"atty",
|
||||
"bitflags",
|
||||
"strsim 0.8.0",
|
||||
"textwrap 0.11.0",
|
||||
"unicode-width",
|
||||
"vec_map",
|
||||
"yaml-rust 0.3.5",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "clap"
|
||||
version = "3.1.18"
|
||||
|
|
@ -329,9 +304,10 @@ dependencies = [
|
|||
"clap_lex",
|
||||
"indexmap",
|
||||
"lazy_static",
|
||||
"strsim 0.10.0",
|
||||
"strsim",
|
||||
"termcolor",
|
||||
"textwrap 0.15.0",
|
||||
"textwrap",
|
||||
"yaml-rust",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -608,7 +584,7 @@ dependencies = [
|
|||
"ident_case",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"strsim 0.10.0",
|
||||
"strsim",
|
||||
"syn",
|
||||
]
|
||||
|
||||
|
|
@ -695,19 +671,6 @@ version = "1.5.3"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
|
||||
|
||||
[[package]]
|
||||
name = "env_logger"
|
||||
version = "0.5.13"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "15b0a4d2e39f8420210be8b27eeda28029729e2fd4291019455016c348240c38"
|
||||
dependencies = [
|
||||
"atty",
|
||||
"humantime 1.3.0",
|
||||
"log",
|
||||
"regex",
|
||||
"termcolor",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "env_logger"
|
||||
version = "0.8.4"
|
||||
|
|
@ -715,8 +678,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3"
|
||||
dependencies = [
|
||||
"atty",
|
||||
"humantime 2.1.0",
|
||||
"humantime",
|
||||
"log",
|
||||
"regex",
|
||||
"termcolor",
|
||||
]
|
||||
|
||||
|
|
@ -941,7 +905,7 @@ dependencies = [
|
|||
"bincode",
|
||||
"chrono",
|
||||
"crossbeam-channel",
|
||||
"env_logger 0.8.4",
|
||||
"env_logger",
|
||||
"ffi-support",
|
||||
"flate2",
|
||||
"log",
|
||||
|
|
@ -1078,15 +1042,6 @@ dependencies = [
|
|||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "humantime"
|
||||
version = "1.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
|
||||
dependencies = [
|
||||
"quick-error",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "humantime"
|
||||
version = "2.1.0"
|
||||
|
|
@ -1472,6 +1427,16 @@ dependencies = [
|
|||
"memoffset",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "nom"
|
||||
version = "5.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
"version_check",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "nom"
|
||||
version = "6.2.1"
|
||||
|
|
@ -1619,7 +1584,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "osmesa-src"
|
||||
version = "0.2.0"
|
||||
source = "git+https://github.com/servo/osmesa-src#6d42746f1f4720efb1bbfab815e3a0f3d12e7024"
|
||||
source = "git+https://github.com/servo/osmesa-src#51679b6a34c2fd98b5a4be1fa225c24ef289d8d7"
|
||||
|
||||
[[package]]
|
||||
name = "osmesa-sys"
|
||||
|
|
@ -1793,12 +1758,6 @@ dependencies = [
|
|||
"unicode-xid",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quick-error"
|
||||
version = "1.2.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
|
||||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
version = "1.0.18"
|
||||
|
|
@ -1973,31 +1932,16 @@ version = "1.1.0"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
|
||||
|
||||
[[package]]
|
||||
name = "semver"
|
||||
version = "0.9.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
|
||||
dependencies = [
|
||||
"semver-parser 0.7.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "semver"
|
||||
version = "0.11.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
|
||||
dependencies = [
|
||||
"semver-parser 0.10.2",
|
||||
"semver-parser",
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "semver-parser"
|
||||
version = "0.7.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
|
||||
|
||||
[[package]]
|
||||
name = "semver-parser"
|
||||
version = "0.10.2"
|
||||
|
|
@ -2112,12 +2056,6 @@ version = "1.1.0"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
|
||||
|
||||
[[package]]
|
||||
name = "strsim"
|
||||
version = "0.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
|
||||
|
||||
[[package]]
|
||||
name = "strsim"
|
||||
version = "0.10.0"
|
||||
|
|
@ -2178,15 +2116,6 @@ dependencies = [
|
|||
"winapi-util",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "textwrap"
|
||||
version = "0.11.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
|
||||
dependencies = [
|
||||
"unicode-width",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "textwrap"
|
||||
version = "0.15.0"
|
||||
|
|
@ -2302,12 +2231,6 @@ dependencies = [
|
|||
"tinyvec",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "unicode-width"
|
||||
version = "0.1.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-xid"
|
||||
version = "0.2.0"
|
||||
|
|
@ -2338,7 +2261,7 @@ dependencies = [
|
|||
"anyhow",
|
||||
"askama",
|
||||
"cargo_metadata",
|
||||
"clap 3.1.18",
|
||||
"clap",
|
||||
"heck",
|
||||
"paste 1.0.7",
|
||||
"serde",
|
||||
|
|
@ -2390,12 +2313,6 @@ dependencies = [
|
|||
"getrandom",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "vec_map"
|
||||
version = "0.8.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
|
||||
|
||||
[[package]]
|
||||
name = "version_check"
|
||||
version = "0.9.1"
|
||||
|
|
@ -2623,7 +2540,7 @@ version = "0.1.0"
|
|||
dependencies = [
|
||||
"app_units",
|
||||
"core-foundation 0.7.0",
|
||||
"env_logger 0.5.13",
|
||||
"env_logger",
|
||||
"euclid",
|
||||
"gleam",
|
||||
"glutin",
|
||||
|
|
@ -2667,7 +2584,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
checksum = "8a69b360c3d0df7dc1a18124677ee8476576c806418f30a360a6cf6cf4e072a6"
|
||||
dependencies = [
|
||||
"fs-err",
|
||||
"nom 5.1.1",
|
||||
"nom 5.1.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -2768,12 +2685,12 @@ version = "0.3.0"
|
|||
dependencies = [
|
||||
"base64",
|
||||
"chrono",
|
||||
"clap 2.33.0",
|
||||
"clap",
|
||||
"core-foundation 0.9.2",
|
||||
"core-graphics 0.22.3",
|
||||
"crossbeam",
|
||||
"dwrote",
|
||||
"env_logger 0.5.13",
|
||||
"env_logger",
|
||||
"font-loader",
|
||||
"gleam",
|
||||
"glsl",
|
||||
|
|
@ -2785,7 +2702,7 @@ dependencies = [
|
|||
"ndk-glue",
|
||||
"osmesa-src",
|
||||
"osmesa-sys",
|
||||
"semver 0.9.0",
|
||||
"semver",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"swgl",
|
||||
|
|
@ -2793,7 +2710,7 @@ dependencies = [
|
|||
"tracy-rs",
|
||||
"webrender",
|
||||
"winit",
|
||||
"yaml-rust 0.4.3",
|
||||
"yaml-rust",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -2829,12 +2746,6 @@ version = "0.8.2"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2bb76e5c421bbbeb8924c60c030331b345555024d56261dae8f3e786ed817c23"
|
||||
|
||||
[[package]]
|
||||
name = "yaml-rust"
|
||||
version = "0.3.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e66366e18dc58b46801afbf2ca7661a9f59cc8c5962c29892b6039b4f86fa992"
|
||||
|
||||
[[package]]
|
||||
name = "yaml-rust"
|
||||
version = "0.4.3"
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ debug = ["webrender/capture", "webrender/profiler"]
|
|||
|
||||
[dependencies]
|
||||
app_units = "0.7"
|
||||
env_logger = "0.5"
|
||||
env_logger = "0.8"
|
||||
euclid = "0.22"
|
||||
gleam = "0.13"
|
||||
glutin = "0.28"
|
||||
|
|
|
|||
|
|
@ -14,10 +14,11 @@ packages = [
|
|||
# glsl requires 5.1, and xcursor (required by winit) requires 7.1.
|
||||
# when a version of glsl depending on 7.1 is published we can update.
|
||||
"nom",
|
||||
# Transitive dependency of Glean - see bug 1771743
|
||||
# * v0.1.18 through rkv
|
||||
# * v1.0.7 through UniFFI
|
||||
"paste",
|
||||
"rand_core",
|
||||
# Can be fixed by updating clap dependency - see bug 1765326
|
||||
"strsim",
|
||||
"yaml-rust",
|
||||
# Can be fixed by removing time dependency - see bug 1765324
|
||||
"wasi",
|
||||
]
|
||||
|
|
|
|||
|
|
@ -13,10 +13,10 @@ path = "src/main.rs"
|
|||
|
||||
[dependencies]
|
||||
base64 = "0.13"
|
||||
env_logger = { version = "0.5", optional = true }
|
||||
env_logger = { version = "0.8.4", optional = true }
|
||||
gleam = "0.13"
|
||||
glutin = "0.28"
|
||||
clap = { version = "2", features = ["yaml"] }
|
||||
clap = { version = "3.1", features = ["yaml"] }
|
||||
glsl = "6.0"
|
||||
log = "0.4"
|
||||
yaml-rust = "0.4"
|
||||
|
|
@ -29,7 +29,7 @@ osmesa-src = { version = "0.2", git = "https://github.com/servo/osmesa-src", opt
|
|||
webrender = { path = "../webrender", features = ["capture", "replay", "png", "profiler", "no_static_freetype", "leak_checks"] }
|
||||
winit = "0.26"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
semver = "0.9.0"
|
||||
semver = "0.11.0"
|
||||
swgl = { path = "../swgl", optional = true }
|
||||
tracy-rs = "0.1.2"
|
||||
|
||||
|
|
|
|||
|
|
@ -484,7 +484,7 @@ fn rawtest(mut wrench: Wrench, window: &mut WindowWrapper, rx: Receiver<Notifier
|
|||
fn reftest<'a>(
|
||||
mut wrench: Wrench,
|
||||
window: &mut WindowWrapper,
|
||||
subargs: &clap::ArgMatches<'a>,
|
||||
subargs: &clap::ArgMatches,
|
||||
rx: Receiver<NotifierEvent>
|
||||
) -> usize {
|
||||
let dim = window.get_inner_size();
|
||||
|
|
@ -571,9 +571,11 @@ pub fn main() {
|
|||
);
|
||||
}
|
||||
|
||||
#[allow(deprecated)] // FIXME(bug 1771450): Use clap-serde or another way
|
||||
let args_yaml = load_yaml!("args.yaml");
|
||||
let clap = clap::App::from_yaml(args_yaml)
|
||||
.setting(clap::AppSettings::ArgRequiredElseHelp);
|
||||
#[allow(deprecated)] // FIXME(bug 1771450): Use clap-serde or another way
|
||||
let clap = clap::Command::from_yaml(args_yaml)
|
||||
.arg_required_else_help(true);
|
||||
|
||||
// On android devices, attempt to read command line arguments from a text
|
||||
// file located at <external_data_dir>/wrench/args.
|
||||
|
|
@ -835,7 +837,7 @@ fn render<'a>(
|
|||
wrench: &mut Wrench,
|
||||
window: &mut WindowWrapper,
|
||||
events_loop: &mut winit::event_loop::EventLoop<()>,
|
||||
subargs: &clap::ArgMatches<'a>,
|
||||
subargs: &clap::ArgMatches,
|
||||
no_block: bool,
|
||||
no_batch: bool,
|
||||
) {
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче