Format toml files (#30112)

* Add taplo fmt config for toml fmt

* fmt toml files

* Add even-better-toml to extensions recommendations
This commit is contained in:
Samson 2023-08-17 17:07:43 +02:00 committed by GitHub
parent 6622b91f79
commit c0bee7cb86
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 139 additions and 124 deletions

View file

@ -1,7 +1,6 @@
{
// See http://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
// Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
// List of extensions which should be recommended for users of this workspace.
"recommendations": [
// Trim only touched lines.
@ -15,6 +14,8 @@
// CSS support for HTML documents.
"ecmel.vscode-html-css",
// IDL language support
"mythmon.idl"
"mythmon.idl",
// TOML files
"tamasfe.even-better-toml"
]
}

View file

@ -22,7 +22,7 @@ byteorder = "1.0"
encoding_rs = "0.8"
euclid = "0.22"
cookie = "0.12"
content-security-policy = { version = "0.5", features = ["serde"]}
content-security-policy = { version = "0.5", features = ["serde"] }
crossbeam-channel = "0.5"
cssparser = "0.29"
darling = { version = "0.13", default-features = false }

View file

@ -37,7 +37,7 @@ profile_traits = { path = "../profile_traits" }
script_traits = { path = "../script_traits" }
serde = { workspace = true }
servo_config = { path = "../config" }
servo_rand = {path = "../rand" }
servo_rand = { path = "../rand" }
servo_remutex = { path = "../remutex" }
servo_url = { path = "../url" }
style_traits = { path = "../style_traits" }

View file

@ -52,4 +52,3 @@ unicode-bidi = { workspace = true, features = ["with_serde"] }
unicode-script = { workspace = true }
webrender_api = { workspace = true }
xi-unicode = { workspace = true }

View file

@ -69,7 +69,7 @@ webrender_api = { workspace = true }
webpki-roots = { workspace = true }
[dev-dependencies]
futures = {version = "0.3", features = ["compat"]}
futures = { version = "0.3", features = ["compat"] }
std_test_override = { path = "../std_test_override" }
tokio-test = "0.4"
tokio-stream = { version = "0.1", features = ["net"] }

View file

@ -15,4 +15,4 @@ unrooted_must_root_lint = []
trace_in_no_trace_lint = []
[package.metadata.rust-analyzer]
rustc_private=true
rustc_private = true

View file

@ -17,7 +17,7 @@ path = "lib.rs"
[features]
bench = []
shmem = [ "dep:to_shmem", "dep:to_shmem_derive" ]
shmem = ["dep:to_shmem", "dep:to_shmem_derive"]
[dependencies]
bitflags = "1.0"

View file

@ -18,10 +18,20 @@ doctest = false
[features]
gecko = ["style_traits/gecko", "bindgen", "regex", "toml", "num_cpus", "mozbuild"]
servo = ["serde", "style_traits/servo", "servo_atoms", "servo_config", "html5ever",
"cssparser/serde", "encoding_rs", "malloc_size_of/servo", "servo_url",
"string_cache", "to_shmem/servo",
"servo_arc/servo"]
servo = [
"serde",
"style_traits/servo",
"servo_atoms",
"servo_config",
"html5ever",
"cssparser/serde",
"encoding_rs",
"malloc_size_of/servo",
"servo_url",
"string_cache",
"to_shmem/servo",
"servo_arc/servo",
]
gecko_debug = []
gecko_refcount_logging = []
@ -78,7 +88,7 @@ void = "1.0.2"
bindgen = { version = "0.62", optional = true, default-features = false }
lazy_static = "1"
log = "0.4"
mozbuild = {version = "0.1", optional = true}
mozbuild = { version = "0.1", optional = true }
regex = { version = "1.1", optional = true }
toml = { version = "0.5", optional = true, default-features = false }
walkdir = "2.1.4"

View file

@ -13,4 +13,3 @@ path = "lib.rs"
[dependencies]
euclid = { workspace = true }
surfman = { workspace = true }

View file

@ -13,4 +13,3 @@ path = "lib.rs"
[dependencies]
euclid = { workspace = true }
webrender_api = { workspace = true }

View file

@ -34,4 +34,3 @@ webxr = { git = "https://github.com/servo/webxr", features = ["glwindow"] }
[build-dependencies]
gst-plugin-version-helper = "0.2"

View file

@ -13,7 +13,7 @@ libservo = { path = "../../../components/servo" }
log = { workspace = true }
servo-media = { git = "https://github.com/servo/media" }
surfman = { workspace = true, features = ["sm-angle-default"] }
webxr = { git = "https://github.com/servo/webxr"}
webxr = { git = "https://github.com/servo/webxr" }
webxr-api = { git = "https://github.com/servo/webxr", features = ["ipc"] }
[target.'cfg(not(target_os = "macos"))'.dependencies]
@ -31,7 +31,7 @@ libloading = "0.5"
[build-dependencies]
gl_generator = "0.14"
serde_json = { workspace = true }
vergen = { version = "8.0.0", features = [ "git", "gitcl" ]}
vergen = { version = "8.0.0", features = ["git", "gitcl"] }
[features]
debugmozjs = ["libservo/debugmozjs"]

View file

@ -6,4 +6,3 @@ documentation_style = "c99"
[export]
exclude = ["OutputDebugStringA"]

View file

@ -14,7 +14,7 @@ path = "main.rs"
bench = false
[build-dependencies]
vergen = { version = "8.0.0", features = [ "git", "gitcl" ]}
vergen = { version = "8.0.0", features = ["git", "gitcl"] }
[target.'cfg(windows)'.build-dependencies]
winres = "0.1"

View file

@ -1,4 +1,4 @@
match_block_trailing_comma = true
binop_separator = "Back"
reorder_imports = true
ignore = [ "third_party" ]
ignore = ["third_party"]

9
taplo.toml Normal file
View file

@ -0,0 +1,9 @@
# upstream files we should not format
exclude = ["third_party/**", "tests/**"]
[formatting]
array_auto_collapse = false
array_auto_expand = false
align_comments = false
column_width = 120
indent_string = " "