Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 14:35:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #29016 - servo:dependabot/cargo/servo-media-1ccb9c7, r=jdm

Browse source 
Bump servo-media from `b23e722` to `1ccb9c7`

Bumps [servo-media](https://github.com/servo/media) from `b23e722` to `1ccb9c7`.
<details>
<summary>Commits</summary>
<ul>
<li><a href="1ccb9c7ce0"><code>1ccb9c7</code></a> Auto merge of <a href="https://github-redirect.dependabot.com/servo/media/issues/386">#386</a> - yvt:patch/smallvec-1, r=jdm</li>
<li><a href="b028fefaf6"><code>b028fef</code></a> Auto merge of <a href="https://github-redirect.dependabot.com/servo/media/issues/388">#388</a> - servo:github-ci, r=Manishearth</li>
<li><a href="b0e8af134c"><code>b0e8af1</code></a> Add github workflow.</li>
<li><a href="d596537a80"><code>d596537</code></a> chore(deps): bump <code>smallvec</code> from <code>^0.6</code> to <code>^1</code></li>
<li><a href="3dd97fc6c0"><code>3dd97fc</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/servo/media/issues/387">#387</a> from yvt/patch/address-lints</li>
<li><a href="c5508dbef4"><code>c5508db</code></a> refactor(gstreamer): remove <code>#![feature(nll)]</code></li>
<li><a href="9de6520341"><code>9de6520</code></a> refactor(webrtc): address <code>anonymous_parameters</code></li>
<li><a href="19764e31f0"><code>19764e3</code></a> refactor(player): suppress <code>dead_code</code> lint in <code>VideoFrame::buffer</code></li>
<li><a href="6559ec4378"><code>6559ec4</code></a> refactor(gstreamer): address <code>semicolon_in_expressions_from_macros</code></li>
<li>See full diff in <a href="b23e72285e...1ccb9c7ce0">compare view</a></li>
</ul>
</details>
<br />

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

</details>
This commit is contained in:
bors-servo 2022-10-19 19:55:06 -04:00 • committed by GitHub
commit 9901cb3993
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

81
Cargo.lock generated
View file

@ -1221,7 +1221,7 @@ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"serde", "serde",
"smallvec 1.9.0", "smallvec",
"syn", "syn",
] ]
@ -1698,7 +1698,7 @@ dependencies = [
"half", "half",
"lebe", "lebe",
"miniz_oxide 0.5.4", "miniz_oxide 0.5.4",
"smallvec 1.9.0", "smallvec",
"threadpool", "threadpool",
] ]
@ -1713,7 +1713,7 @@ name = "fallible"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"hashglobe", "hashglobe",
"smallvec 1.9.0", "smallvec",
] ]
[[package]] [[package]]
@ -2080,7 +2080,7 @@ dependencies = [
"servo_arc", "servo_arc",
"servo_atoms", "servo_atoms",
"servo_url", "servo_url",
"smallvec 1.9.0", "smallvec",
"style", "style",
"time", "time",
"truetype", "truetype",
@ -2119,7 +2119,7 @@ dependencies = [
"parking_lot 0.11.0", "parking_lot 0.11.0",
"range-alloc", "range-alloc",
"raw-window-handle", "raw-window-handle",
"smallvec 1.9.0", "smallvec",
"spirv_cross", "spirv_cross",
"thunderdome", "thunderdome",
"winapi", "winapi",
@ -2141,7 +2141,7 @@ dependencies = [
"log", "log",
"range-alloc", "range-alloc",
"raw-window-handle", "raw-window-handle",
"smallvec 1.9.0", "smallvec",
"spirv_cross", "spirv_cross",
"winapi", "winapi",
] ]
@ -2178,7 +2178,7 @@ dependencies = [
"parking_lot 0.11.0", "parking_lot 0.11.0",
"range-alloc", "range-alloc",
"raw-window-handle", "raw-window-handle",
"smallvec 1.9.0", "smallvec",
"spirv_cross", "spirv_cross",
"storage-map", "storage-map",
] ]
@ -2199,7 +2199,7 @@ dependencies = [
"log", "log",
"objc", "objc",
"raw-window-handle", "raw-window-handle",
"smallvec 1.9.0", "smallvec",
"winapi", "winapi",
] ]
@ -3225,7 +3225,7 @@ dependencies = [
"servo_geometry", "servo_geometry",
"servo_url", "servo_url",
"size_of_test", "size_of_test",
"smallvec 1.9.0", "smallvec",
"style", "style",
"style_traits", "style_traits",
"unicode-bidi", "unicode-bidi",
@ -3473,7 +3473,7 @@ dependencies = [
"log", "log",
"servo-egl", "servo-egl",
"simpleservo", "simpleservo",
"smallvec 1.9.0", "smallvec",
"webxr", "webxr",
"webxr-api", "webxr-api",
] ]
@ -3655,7 +3655,7 @@ dependencies = [
"serde_bytes", "serde_bytes",
"servo_arc", "servo_arc",
"smallbitvec", "smallbitvec",
"smallvec 1.9.0", "smallvec",
"string_cache", "string_cache",
"thin-slice", "thin-slice",
"time", "time",
@ -4584,7 +4584,7 @@ dependencies = [
"cloudabi 0.0.3", "cloudabi 0.0.3",
"libc", "libc",
"redox_syscall 0.1.56", "redox_syscall 0.1.56",
"smallvec 1.9.0", "smallvec",
"winapi", "winapi",
] ]
@ -4599,7 +4599,7 @@ dependencies = [
"instant", "instant",
"libc", "libc",
"redox_syscall 0.1.56", "redox_syscall 0.1.56",
"smallvec 1.9.0", "smallvec",
"winapi", "winapi",
] ]
@ -4612,7 +4612,7 @@ dependencies = [
"cfg-if 1.0.0", "cfg-if 1.0.0",
"libc", "libc",
"redox_syscall 0.2.13", "redox_syscall 0.2.13",
"smallvec 1.9.0", "smallvec",
"windows-sys", "windows-sys",
] ]
@ -5433,7 +5433,7 @@ dependencies = [
"servo_geometry", "servo_geometry",
"servo_rand", "servo_rand",
"servo_url", "servo_url",
"smallvec 1.9.0", "smallvec",
"sparkle", "sparkle",
"style", "style",
"style_traits", "style_traits",
@ -5536,7 +5536,7 @@ dependencies = [
"serde", "serde",
"servo_atoms", "servo_atoms",
"servo_url", "servo_url",
"smallvec 1.9.0", "smallvec",
"style_traits", "style_traits",
"time", "time",
"uuid", "uuid",
@ -5582,7 +5582,7 @@ dependencies = [
"phf_codegen 0.8.0", "phf_codegen 0.8.0",
"precomputed-hash", "precomputed-hash",
"servo_arc", "servo_arc",
"smallvec 1.9.0", "smallvec",
"to_shmem", "to_shmem",
"to_shmem_derive", "to_shmem_derive",
] ]
@ -5720,7 +5720,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-media" name = "servo-media"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/servo/media#b23e72285ecbe352737eafa4100e65763cc9ccfc" source = "git+https://github.com/servo/media#1ccb9c7ce0acc2637c84f31a1204b1d5798993b9"
dependencies = [ dependencies = [
"servo-media-audio", "servo-media-audio",
"servo-media-player", "servo-media-player",
@ -5732,7 +5732,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-media-audio" name = "servo-media-audio"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/servo/media#b23e72285ecbe352737eafa4100e65763cc9ccfc" source = "git+https://github.com/servo/media#1ccb9c7ce0acc2637c84f31a1204b1d5798993b9"
dependencies = [ dependencies = [
"boxfnonce", "boxfnonce",
"byte-slice-cast", "byte-slice-cast",
@ -5747,14 +5747,14 @@ dependencies = [
"servo-media-streams", "servo-media-streams",
"servo-media-traits", "servo-media-traits",
"servo_media_derive", "servo_media_derive",
"smallvec 0.6.13", "smallvec",
"speexdsp-resampler", "speexdsp-resampler",
] ]
[[package]] [[package]]
name = "servo-media-dummy" name = "servo-media-dummy"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/servo/media#b23e72285ecbe352737eafa4100e65763cc9ccfc" source = "git+https://github.com/servo/media#1ccb9c7ce0acc2637c84f31a1204b1d5798993b9"
dependencies = [ dependencies = [
"boxfnonce", "boxfnonce",
"ipc-channel", "ipc-channel",
@ -5769,7 +5769,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-media-gstreamer" name = "servo-media-gstreamer"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/servo/media#b23e72285ecbe352737eafa4100e65763cc9ccfc" source = "git+https://github.com/servo/media#1ccb9c7ce0acc2637c84f31a1204b1d5798993b9"
dependencies = [ dependencies = [
"boxfnonce", "boxfnonce",
"byte-slice-cast", "byte-slice-cast",
@ -5805,7 +5805,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-media-gstreamer-render" name = "servo-media-gstreamer-render"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/servo/media#b23e72285ecbe352737eafa4100e65763cc9ccfc" source = "git+https://github.com/servo/media#1ccb9c7ce0acc2637c84f31a1204b1d5798993b9"
dependencies = [ dependencies = [
"gstreamer", "gstreamer",
"gstreamer-video", "gstreamer-video",
@ -5815,7 +5815,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-media-gstreamer-render-android" name = "servo-media-gstreamer-render-android"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/servo/media#b23e72285ecbe352737eafa4100e65763cc9ccfc" source = "git+https://github.com/servo/media#1ccb9c7ce0acc2637c84f31a1204b1d5798993b9"
dependencies = [ dependencies = [
"glib", "glib",
"gstreamer", "gstreamer",
@ -5828,7 +5828,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-media-gstreamer-render-unix" name = "servo-media-gstreamer-render-unix"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/servo/media#b23e72285ecbe352737eafa4100e65763cc9ccfc" source = "git+https://github.com/servo/media#1ccb9c7ce0acc2637c84f31a1204b1d5798993b9"
dependencies = [ dependencies = [
"glib", "glib",
"gstreamer", "gstreamer",
@ -5841,7 +5841,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-media-player" name = "servo-media-player"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/servo/media#b23e72285ecbe352737eafa4100e65763cc9ccfc" source = "git+https://github.com/servo/media#1ccb9c7ce0acc2637c84f31a1204b1d5798993b9"
dependencies = [ dependencies = [
"ipc-channel", "ipc-channel",
"serde", "serde",
@ -5853,7 +5853,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-media-streams" name = "servo-media-streams"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/servo/media#b23e72285ecbe352737eafa4100e65763cc9ccfc" source = "git+https://github.com/servo/media#1ccb9c7ce0acc2637c84f31a1204b1d5798993b9"
dependencies = [ dependencies = [
"lazy_static", "lazy_static",
"uuid", "uuid",
@ -5862,12 +5862,12 @@ dependencies = [
[[package]] [[package]]
name = "servo-media-traits" name = "servo-media-traits"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/servo/media#b23e72285ecbe352737eafa4100e65763cc9ccfc" source = "git+https://github.com/servo/media#1ccb9c7ce0acc2637c84f31a1204b1d5798993b9"
[[package]] [[package]]
name = "servo-media-webrtc" name = "servo-media-webrtc"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/servo/media#b23e72285ecbe352737eafa4100e65763cc9ccfc" source = "git+https://github.com/servo/media#1ccb9c7ce0acc2637c84f31a1204b1d5798993b9"
dependencies = [ dependencies = [
"boxfnonce", "boxfnonce",
"lazy_static", "lazy_static",
@ -5945,7 +5945,7 @@ dependencies = [
[[package]] [[package]]
name = "servo_media_derive" name = "servo_media_derive"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/servo/media#b23e72285ecbe352737eafa4100e65763cc9ccfc" source = "git+https://github.com/servo/media#1ccb9c7ce0acc2637c84f31a1204b1d5798993b9"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -6136,15 +6136,6 @@ version = "2.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "75ce4f9dc4a41b4c3476cc925f1efb11b66df373a8fde5d4b8915fa91b5d995e" checksum = "75ce4f9dc4a41b4c3476cc925f1efb11b66df373a8fde5d4b8915fa91b5d995e"
[[package]]
name = "smallvec"
version = "0.6.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6"
dependencies = [
"maybe-uninit",
]
[[package]] [[package]]
name = "smallvec" name = "smallvec"
version = "1.9.0" version = "1.9.0"
@ -6341,7 +6332,7 @@ dependencies = [
"servo_config", "servo_config",
"servo_url", "servo_url",
"smallbitvec", "smallbitvec",
"smallvec 1.9.0", "smallvec",
"string_cache", "string_cache",
"style_derive", "style_derive",
"style_traits", "style_traits",
@ -6673,7 +6664,7 @@ dependencies = [
"cssparser", "cssparser",
"servo_arc", "servo_arc",
"smallbitvec", "smallbitvec",
"smallvec 1.9.0", "smallvec",
"string_cache", "string_cache",
"thin-slice", "thin-slice",
] ]
@ -7208,7 +7199,7 @@ checksum = "a21817947c7011bbd0a27e11b17b337bfd022e8544b071a2641232047966fbda"
dependencies = [ dependencies = [
"nix 0.20.0", "nix 0.20.0",
"once_cell", "once_cell",
"smallvec 1.9.0", "smallvec",
"wayland-sys 0.28.6", "wayland-sys 0.28.6",
] ]
@ -7330,7 +7321,7 @@ dependencies = [
"msg", "msg",
"serde", "serde",
"servo_config", "servo_config",
"smallvec 1.9.0", "smallvec",
"webrender_api", "webrender_api",
"webrender_traits", "webrender_traits",
"wgpu-core", "wgpu-core",
@ -7371,7 +7362,7 @@ dependencies = [
"serde", "serde",
"serde_json", "serde_json",
"sig", "sig",
"smallvec 1.9.0", "smallvec",
"svg_fmt", "svg_fmt",
"time", "time",
"tracy-rs", "tracy-rs",
@ -7491,7 +7482,7 @@ dependencies = [
"parking_lot 0.11.0", "parking_lot 0.11.0",
"ron 0.6.0", "ron 0.6.0",
"serde", "serde",
"smallvec 1.9.0", "smallvec",
"thiserror", "thiserror",
"tracing", "tracing",
"wgpu-types", "wgpu-types",

3
servo-tidy.toml
View file

@ -83,9 +83,6 @@ packages = [
# https://github.com/servo/servo/pull/23288#issuecomment-494687746 # https://github.com/servo/servo/pull/23288#issuecomment-494687746
"gl_generator", "gl_generator",
# Lots of crates to update.
"smallvec",
# https://github.com/servo/servo/pull/25518 # https://github.com/servo/servo/pull/25518
"core-foundation", "core-foundation",
"core-foundation-sys", "core-foundation-sys",