mirror of
https://github.com/servo/servo.git
synced 2025-08-04 13:10:20 +01:00
Make Cargo.toml
a little friendlier (#31773)
Instead of using a strange number of spaces (5) for the example override, use a single space. This makes it much easier to undo changes to this file when switching between overriding a dependency and not overriding a dependency. Also switch from depending on `https://github.com/servo/style.git` to the more common `https://github.com/servo/style`.
This commit is contained in:
parent
94d2f2183a
commit
d63615354c
2 changed files with 37 additions and 37 deletions
26
Cargo.lock
generated
26
Cargo.lock
generated
|
@ -1211,7 +1211,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "derive_common"
|
name = "derive_common"
|
||||||
version = "0.0.1"
|
version = "0.0.1"
|
||||||
source = "git+https://github.com/servo/stylo.git?branch=2023-09-01#3d41c54f18ace2bc3708fe3b5c032c5341a331ed"
|
source = "git+https://github.com/servo/stylo?branch=2023-09-01#3d41c54f18ace2bc3708fe3b5c032c5341a331ed"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"darling",
|
"darling",
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
|
@ -3464,7 +3464,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "malloc_size_of"
|
name = "malloc_size_of"
|
||||||
version = "0.0.1"
|
version = "0.0.1"
|
||||||
source = "git+https://github.com/servo/stylo.git?branch=2023-09-01#3d41c54f18ace2bc3708fe3b5c032c5341a331ed"
|
source = "git+https://github.com/servo/stylo?branch=2023-09-01#3d41c54f18ace2bc3708fe3b5c032c5341a331ed"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"accountable-refcell",
|
"accountable-refcell",
|
||||||
"app_units",
|
"app_units",
|
||||||
|
@ -5075,7 +5075,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "selectors"
|
name = "selectors"
|
||||||
version = "0.24.0"
|
version = "0.24.0"
|
||||||
source = "git+https://github.com/servo/stylo.git?branch=2023-09-01#3d41c54f18ace2bc3708fe3b5c032c5341a331ed"
|
source = "git+https://github.com/servo/stylo?branch=2023-09-01#3d41c54f18ace2bc3708fe3b5c032c5341a331ed"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 1.3.2",
|
"bitflags 1.3.2",
|
||||||
"cssparser",
|
"cssparser",
|
||||||
|
@ -5363,7 +5363,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "servo_arc"
|
name = "servo_arc"
|
||||||
version = "0.2.0"
|
version = "0.2.0"
|
||||||
source = "git+https://github.com/servo/stylo.git?branch=2023-09-01#3d41c54f18ace2bc3708fe3b5c032c5341a331ed"
|
source = "git+https://github.com/servo/stylo?branch=2023-09-01#3d41c54f18ace2bc3708fe3b5c032c5341a331ed"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"nodrop",
|
"nodrop",
|
||||||
"serde",
|
"serde",
|
||||||
|
@ -5373,7 +5373,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "servo_atoms"
|
name = "servo_atoms"
|
||||||
version = "0.0.1"
|
version = "0.0.1"
|
||||||
source = "git+https://github.com/servo/stylo.git?branch=2023-09-01#3d41c54f18ace2bc3708fe3b5c032c5341a331ed"
|
source = "git+https://github.com/servo/stylo?branch=2023-09-01#3d41c54f18ace2bc3708fe3b5c032c5341a331ed"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"string_cache",
|
"string_cache",
|
||||||
"string_cache_codegen",
|
"string_cache_codegen",
|
||||||
|
@ -5579,7 +5579,7 @@ checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "size_of_test"
|
name = "size_of_test"
|
||||||
version = "0.0.1"
|
version = "0.0.1"
|
||||||
source = "git+https://github.com/servo/stylo.git?branch=2023-09-01#3d41c54f18ace2bc3708fe3b5c032c5341a331ed"
|
source = "git+https://github.com/servo/stylo?branch=2023-09-01#3d41c54f18ace2bc3708fe3b5c032c5341a331ed"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"static_assertions",
|
"static_assertions",
|
||||||
]
|
]
|
||||||
|
@ -5705,7 +5705,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "static_prefs"
|
name = "static_prefs"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/servo/stylo.git?branch=2023-09-01#3d41c54f18ace2bc3708fe3b5c032c5341a331ed"
|
source = "git+https://github.com/servo/stylo?branch=2023-09-01#3d41c54f18ace2bc3708fe3b5c032c5341a331ed"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "str-buf"
|
name = "str-buf"
|
||||||
|
@ -5748,7 +5748,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "style"
|
name = "style"
|
||||||
version = "0.0.1"
|
version = "0.0.1"
|
||||||
source = "git+https://github.com/servo/stylo.git?branch=2023-09-01#3d41c54f18ace2bc3708fe3b5c032c5341a331ed"
|
source = "git+https://github.com/servo/stylo?branch=2023-09-01#3d41c54f18ace2bc3708fe3b5c032c5341a331ed"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"app_units",
|
"app_units",
|
||||||
"arrayvec",
|
"arrayvec",
|
||||||
|
@ -5807,7 +5807,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "style_config"
|
name = "style_config"
|
||||||
version = "0.0.1"
|
version = "0.0.1"
|
||||||
source = "git+https://github.com/servo/stylo.git?branch=2023-09-01#3d41c54f18ace2bc3708fe3b5c032c5341a331ed"
|
source = "git+https://github.com/servo/stylo?branch=2023-09-01#3d41c54f18ace2bc3708fe3b5c032c5341a331ed"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"lazy_static",
|
"lazy_static",
|
||||||
]
|
]
|
||||||
|
@ -5815,7 +5815,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "style_derive"
|
name = "style_derive"
|
||||||
version = "0.0.1"
|
version = "0.0.1"
|
||||||
source = "git+https://github.com/servo/stylo.git?branch=2023-09-01#3d41c54f18ace2bc3708fe3b5c032c5341a331ed"
|
source = "git+https://github.com/servo/stylo?branch=2023-09-01#3d41c54f18ace2bc3708fe3b5c032c5341a331ed"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"darling",
|
"darling",
|
||||||
"derive_common",
|
"derive_common",
|
||||||
|
@ -5846,7 +5846,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "style_traits"
|
name = "style_traits"
|
||||||
version = "0.0.1"
|
version = "0.0.1"
|
||||||
source = "git+https://github.com/servo/stylo.git?branch=2023-09-01#3d41c54f18ace2bc3708fe3b5c032c5341a331ed"
|
source = "git+https://github.com/servo/stylo?branch=2023-09-01#3d41c54f18ace2bc3708fe3b5c032c5341a331ed"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"app_units",
|
"app_units",
|
||||||
"bitflags 1.3.2",
|
"bitflags 1.3.2",
|
||||||
|
@ -6189,7 +6189,7 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "to_shmem"
|
name = "to_shmem"
|
||||||
version = "0.0.1"
|
version = "0.0.1"
|
||||||
source = "git+https://github.com/servo/stylo.git?branch=2023-09-01#3d41c54f18ace2bc3708fe3b5c032c5341a331ed"
|
source = "git+https://github.com/servo/stylo?branch=2023-09-01#3d41c54f18ace2bc3708fe3b5c032c5341a331ed"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cssparser",
|
"cssparser",
|
||||||
"servo_arc",
|
"servo_arc",
|
||||||
|
@ -6202,7 +6202,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "to_shmem_derive"
|
name = "to_shmem_derive"
|
||||||
version = "0.0.1"
|
version = "0.0.1"
|
||||||
source = "git+https://github.com/servo/stylo.git?branch=2023-09-01#3d41c54f18ace2bc3708fe3b5c032c5341a331ed"
|
source = "git+https://github.com/servo/stylo?branch=2023-09-01#3d41c54f18ace2bc3708fe3b5c032c5341a331ed"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"darling",
|
"darling",
|
||||||
"derive_common",
|
"derive_common",
|
||||||
|
|
48
Cargo.toml
48
Cargo.toml
|
@ -64,7 +64,7 @@ keyboard-types = "0.6"
|
||||||
lazy_static = "1.4"
|
lazy_static = "1.4"
|
||||||
libc = "0.2"
|
libc = "0.2"
|
||||||
log = "0.4"
|
log = "0.4"
|
||||||
malloc_size_of = { git = "https://github.com/servo/stylo.git", branch = "2023-09-01", features = ["servo"] }
|
malloc_size_of = { git = "https://github.com/servo/stylo", branch = "2023-09-01", features = ["servo"] }
|
||||||
malloc_size_of_derive = "0.1"
|
malloc_size_of_derive = "0.1"
|
||||||
mime = "0.3.13"
|
mime = "0.3.13"
|
||||||
mime_guess = "2.0.3"
|
mime_guess = "2.0.3"
|
||||||
|
@ -87,31 +87,31 @@ rustls = { version = "0.21.10", features = ["dangerous_configuration"] }
|
||||||
rustls-pemfile = "1.0.4"
|
rustls-pemfile = "1.0.4"
|
||||||
script_layout_interface = { path = "components/shared/script_layout" }
|
script_layout_interface = { path = "components/shared/script_layout" }
|
||||||
script_traits = { path = "components/shared/script" }
|
script_traits = { path = "components/shared/script" }
|
||||||
selectors = { git = "https://github.com/servo/stylo.git", branch = "2023-09-01" }
|
selectors = { git = "https://github.com/servo/stylo", branch = "2023-09-01" }
|
||||||
serde = "1.0.197"
|
serde = "1.0.197"
|
||||||
serde_bytes = "0.11"
|
serde_bytes = "0.11"
|
||||||
serde_json = "1.0"
|
serde_json = "1.0"
|
||||||
servo-media = { git = "https://github.com/servo/media" }
|
servo-media = { git = "https://github.com/servo/media" }
|
||||||
servo-media-dummy = { git = "https://github.com/servo/media" }
|
servo-media-dummy = { git = "https://github.com/servo/media" }
|
||||||
servo-media-gstreamer = { git = "https://github.com/servo/media" }
|
servo-media-gstreamer = { git = "https://github.com/servo/media" }
|
||||||
servo_arc = { git = "https://github.com/servo/stylo.git", branch = "2023-09-01" }
|
servo_arc = { git = "https://github.com/servo/stylo", branch = "2023-09-01" }
|
||||||
servo_atoms = { git = "https://github.com/servo/stylo.git", branch = "2023-09-01" }
|
servo_atoms = { git = "https://github.com/servo/stylo", branch = "2023-09-01" }
|
||||||
size_of_test = { git = "https://github.com/servo/stylo.git", branch = "2023-09-01" }
|
size_of_test = { git = "https://github.com/servo/stylo", branch = "2023-09-01" }
|
||||||
smallbitvec = "2.5.3"
|
smallbitvec = "2.5.3"
|
||||||
smallvec = "1.13"
|
smallvec = "1.13"
|
||||||
sparkle = "0.1.26"
|
sparkle = "0.1.26"
|
||||||
string_cache = "0.8"
|
string_cache = "0.8"
|
||||||
string_cache_codegen = "0.5"
|
string_cache_codegen = "0.5"
|
||||||
style = { git = "https://github.com/servo/stylo.git", branch = "2023-09-01", features = ["servo"] }
|
style = { git = "https://github.com/servo/stylo", branch = "2023-09-01", features = ["servo"] }
|
||||||
style_config = { git = "https://github.com/servo/stylo.git", branch = "2023-09-01" }
|
style_config = { git = "https://github.com/servo/stylo", branch = "2023-09-01" }
|
||||||
style_traits = { git = "https://github.com/servo/stylo.git", branch = "2023-09-01", features = ["servo"] }
|
style_traits = { git = "https://github.com/servo/stylo", branch = "2023-09-01", features = ["servo"] }
|
||||||
# NOTE: the sm-angle feature only enables ANGLE on Windows, not other platforms!
|
# NOTE: the sm-angle feature only enables ANGLE on Windows, not other platforms!
|
||||||
surfman = { version = "0.9", features = ["chains", "sm-angle", "sm-angle-default"] }
|
surfman = { version = "0.9", features = ["chains", "sm-angle", "sm-angle-default"] }
|
||||||
syn = { version = "2", default-features = false, features = ["clone-impls", "derive", "parsing"] }
|
syn = { version = "2", default-features = false, features = ["clone-impls", "derive", "parsing"] }
|
||||||
synstructure = "0.13"
|
synstructure = "0.13"
|
||||||
thin-vec = "0.2.13"
|
thin-vec = "0.2.13"
|
||||||
time = "0.1.41"
|
time = "0.1.41"
|
||||||
to_shmem = { git = "https://github.com/servo/stylo.git", branch = "2023-09-01" }
|
to_shmem = { git = "https://github.com/servo/stylo", branch = "2023-09-01" }
|
||||||
tokio = "1"
|
tokio = "1"
|
||||||
tokio-rustls = "0.24"
|
tokio-rustls = "0.24"
|
||||||
tungstenite = "0.20"
|
tungstenite = "0.20"
|
||||||
|
@ -151,21 +151,21 @@ debug-assertions = false
|
||||||
#
|
#
|
||||||
# Or for Stylo:
|
# Or for Stylo:
|
||||||
#
|
#
|
||||||
# [patch."https://github.com/servo/stylo.git"]
|
# [patch."https://github.com/servo/stylo"]
|
||||||
# derive_common = { path = "../stylo/derive_common" }
|
# derive_common = { path = "../stylo/derive_common" }
|
||||||
# malloc_size_of = { path = "../stylo/malloc_size_of" }
|
# malloc_size_of = { path = "../stylo/malloc_size_of" }
|
||||||
# selectors = { path = "../stylo/selectors" }
|
# selectors = { path = "../stylo/selectors" }
|
||||||
# servo_arc = { path = "../stylo/servo_arc" }
|
# servo_arc = { path = "../stylo/servo_arc" }
|
||||||
# servo_atoms = { path = "../stylo/atoms" }
|
# servo_atoms = { path = "../stylo/atoms" }
|
||||||
# size_of_test = { path = "../stylo/size_of_test" }
|
# size_of_test = { path = "../stylo/size_of_test" }
|
||||||
# static_prefs = { path = "../stylo/style_static_prefs" }
|
# static_prefs = { path = "../stylo/style_static_prefs" }
|
||||||
# style_config = { path = "../stylo/style_config" }
|
# style_config = { path = "../stylo/style_config" }
|
||||||
# style_derive = { path = "../stylo/style_derive" }
|
# style_derive = { path = "../stylo/style_derive" }
|
||||||
# style = { path = "../stylo/style" }
|
# style = { path = "../stylo/style" }
|
||||||
# style_traits = { path = "../stylo/style_traits" }
|
# style_traits = { path = "../stylo/style_traits" }
|
||||||
# to_shmem = { path = "../stylo/to_shmem" }
|
# to_shmem = { path = "../stylo/to_shmem" }
|
||||||
#
|
#
|
||||||
# Or for another git dependency:
|
# Or for another git dependency:
|
||||||
#
|
#
|
||||||
# [patch."https://github.com/servo/<repository>"]
|
# [patch."https://github.com/servo/<repository>"]
|
||||||
# <crate> = { path = "/path/to/local/checkout" }
|
# <crate> = { path = "/path/to/local/checkout" }
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue