mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-08 19:04:45 +00:00
servo: Merge #8689 - Remove remaining version-conflict exceptions in tidy.py (from jdm:deps); r=frewsxcv
Source-Repo: https://github.com/servo/servo Source-Revision: bc618b0d535e0e67a7ea845c026678113f000d64
This commit is contained in:
parent
5ed073271e
commit
f5c0383b1b
13
servo/components/servo/Cargo.lock
generated
13
servo/components/servo/Cargo.lock
generated
@ -121,11 +121,6 @@ dependencies = [
|
||||
"serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "0.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "0.3.3"
|
||||
@ -762,7 +757,7 @@ dependencies = [
|
||||
"shell32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"user32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"wayland-client 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"wayland-kbd 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"wayland-kbd 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"wayland-window 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"winapi 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"x11 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@ -1960,12 +1955,12 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wayland-kbd"
|
||||
version = "0.2.0"
|
||||
version = "0.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"dlib 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"mmap 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"wayland-client 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
13
servo/ports/cef/Cargo.lock
generated
13
servo/ports/cef/Cargo.lock
generated
@ -110,11 +110,6 @@ dependencies = [
|
||||
"serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "0.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "0.3.3"
|
||||
@ -711,7 +706,7 @@ dependencies = [
|
||||
"shell32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"user32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"wayland-client 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"wayland-kbd 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"wayland-kbd 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"wayland-window 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"winapi 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"x11 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@ -1874,12 +1869,12 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wayland-kbd"
|
||||
version = "0.2.0"
|
||||
version = "0.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"dlib 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"mmap 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"wayland-client 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
13
servo/ports/gonk/Cargo.lock
generated
13
servo/ports/gonk/Cargo.lock
generated
@ -102,11 +102,6 @@ dependencies = [
|
||||
"serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "0.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "0.3.3"
|
||||
@ -713,7 +708,7 @@ dependencies = [
|
||||
"shell32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"user32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"wayland-client 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"wayland-kbd 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"wayland-kbd 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"wayland-window 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"winapi 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"x11 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@ -1852,12 +1847,12 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wayland-kbd"
|
||||
version = "0.2.0"
|
||||
version = "0.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"dlib 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"mmap 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"wayland-client 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
@ -164,7 +164,7 @@ def check_lock(file_name, contents):
|
||||
packages = {}
|
||||
|
||||
# package names to be neglected (as named by cargo)
|
||||
exceptions = ["glutin", "wayland-kbd"]
|
||||
exceptions = []
|
||||
|
||||
while idx < len(contents):
|
||||
content = contents[idx].strip()
|
||||
|
Loading…
Reference in New Issue
Block a user