mirror of
https://github.com/servo/servo.git
synced 2025-08-02 12:10:29 +01:00
Auto merge of #8689 - jdm:deps, r=frewsxcv
Remove remaining version-conflict exceptions in tidy.py. <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8689) <!-- Reviewable:end -->
This commit is contained in:
commit
bc618b0d53
4 changed files with 13 additions and 28 deletions
13
components/servo/Cargo.lock
generated
13
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
ports/cef/Cargo.lock
generated
13
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
ports/gonk/Cargo.lock
generated
13
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…
Add table
Add a link
Reference in a new issue