Skip to content

Commit d7b8e71

Browse files
authored
Change TOML formatting (#11475)
1 parent 27630fb commit d7b8e71

File tree

61 files changed

+285
-497
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+285
-497
lines changed

.typos.toml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ extend-exclude = [
88
"*.snap",
99
"crates/viewer/re_ui/src/design_tokens.rs",
1010
"examples/assets",
11-
"rerun_cpp/src/rerun/archetypes/image.hpp", # TODO(emilk): remove once we remove from_greyscale8
11+
"rerun_cpp/src/rerun/archetypes/image.hpp", # TODO(emilk): remove once we remove from_greyscale8
1212
"rerun_cpp/src/rerun/archetypes/image_ext.cpp", # TODO(emilk): remove once we remove from_greyscale8
1313
"rerun_cpp/src/rerun/third_party/cxxopts.hpp",
1414
"*.png",
@@ -17,16 +17,16 @@ extend-exclude = [
1717
]
1818

1919
[default.extend-words]
20-
FUL = "FUL" # forward-up-left coordinate system
21-
lod = "lod" # level-of-detail
22-
ND = "ND" # np.NDArray
23-
opf = "opf" # Open Photogrammetry Format (OPF) file
20+
FUL = "FUL" # forward-up-left coordinate system
21+
lod = "lod" # level-of-detail
22+
ND = "ND" # np.NDArray
23+
opf = "opf" # Open Photogrammetry Format (OPF) file
2424
somes = "somes" # many `Some`
25-
teh = "teh" # part of @teh-cmc
26-
trak = "trak" # mp4 crate spelling
27-
typ = "typ" # We cannot write "type" in rust
28-
ws = "ws" # web-sockets, as in "ws://…"
29-
Yoh = "Yoh" # Part of @YohDeadfall
25+
teh = "teh" # part of @teh-cmc
26+
trak = "trak" # mp4 crate spelling
27+
typ = "typ" # We cannot write "type" in rust
28+
ws = "ws" # web-sockets, as in "ws://…"
29+
Yoh = "Yoh" # Part of @YohDeadfall
3030

3131
# Use the more common spelling
3232
adaptor = "adapter"
@@ -158,9 +158,9 @@ extend-ignore-re = [
158158
"_[a-f0-9]{16}",
159159

160160

161-
"np.arange", # numpy spells "arrange" wrong
161+
"np.arange", # numpy spells "arrange" wrong
162162
"phc_[a-zA-Z0-9]*", # Posthog public key
163-
"PNG.?", # Workaround for https://github.com/crate-ci/typos/issues/967
163+
"PNG.?", # Workaround for https://github.com/crate-ci/typos/issues/967
164164

165165
"_LEVL_", # Used in air_traffic_data.py
166166

Cargo.toml

Lines changed: 19 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ authors = ["rerun.io <[email protected]>"]
2222
edition = "2024"
2323
homepage = "https://rerun.io"
2424
include = [
25-
"../../Cargo.lock", # So that users can pass `--locked` to `cargo install rerun-cli`
25+
"../../Cargo.lock", # So that users can pass `--locked` to `cargo install rerun-cli`
2626
"../../LICENSE-APACHE",
2727
"../../LICENSE-MIT",
2828
"**/*.rs",
@@ -44,7 +44,7 @@ ignored = [
4444
"re_renderer_examples",
4545

4646
# used for specific targets or features
47-
"chrono", # TODO(#11368)
47+
"chrono", # TODO(#11368)
4848
"home",
4949
"profiling",
5050
"wayland-sys",
@@ -169,12 +169,7 @@ eframe = { version = "0.32.3", default-features = false, features = [
169169
egui = { version = "0.32.3", features = ["callstack", "color-hex", "rayon"] }
170170
egui_commonmark = { version = "0.21", default-features = false }
171171
egui_dnd = { version = "0.13" }
172-
egui_extras = { version = "0.32.3", features = [
173-
"http",
174-
"image",
175-
"serde",
176-
"svg",
177-
] }
172+
egui_extras = { version = "0.32.3", features = ["http", "image", "serde", "svg"] }
178173
egui_kittest = { version = "0.32.3", features = ["wgpu", "snapshot", "eframe"] }
179174
egui_plot = "0.33" # https://github.com/emilk/egui_plot
180175
egui_table = "0.4" # https://github.com/rerun-io/egui_table
@@ -322,10 +317,7 @@ raw-window-handle = "0.6.2"
322317
rayon = "1.11"
323318
regex-lite = "0.1.7"
324319
rexif = "0.7.5"
325-
rfd = { version = "0.15.4", default-features = false, features = [
326-
"async-std",
327-
"xdg-portal",
328-
] }
320+
rfd = { version = "0.15.4", default-features = false, features = ["async-std", "xdg-portal"] }
329321
ron = { version = "0.10.1", features = ["integer128"] }
330322
roxmltree = "0.19.0"
331323
rustdoc-json = "0.9.7"
@@ -368,18 +360,14 @@ tower-http = "0.6.6"
368360
tower-service = "0.3.3"
369361
tracing = "0.1.41"
370362
tracing-opentelemetry = "0.31.0"
371-
tracing-subscriber = { version = "0.3.20", features = [
372-
"tracing-log",
373-
"fmt",
374-
"env-filter",
375-
] }
363+
tracing-subscriber = { version = "0.3.20", features = ["tracing-log", "fmt", "env-filter"] }
376364
tracing-tracy = { version = "0.11.4", default-features = false, features = [
377365
"broadcast",
378366
"callstack-inlines",
379367
"code-transfer",
380368
"context-switch-tracing",
381369
"enable",
382-
"ondemand", # much nicer for a long-lived program
370+
"ondemand", # much nicer for a long-lived program
383371
"system-tracing",
384372
] } # no sampling, it's very noisy and not that useful
385373
type-map = "0.5.1"
@@ -400,8 +388,8 @@ walkdir = "2.5"
400388
# Do not make this an `=` dependency, because that may break Rust users’ builds when a newer
401389
# version is released, even if they are not building the web viewer.
402390
# For details see https://github.com/rerun-io/rerun/issues/8766
403-
wasm-bindgen = "0.2.100" # ⚠️ read above notice before touching this!
404-
wasm-bindgen-cli-support = "=0.2.100" # ⚠️ read above notice before touching this!
391+
wasm-bindgen = "0.2.100" # ⚠️ read above notice before touching this!
392+
wasm-bindgen-cli-support = "=0.2.100" # ⚠️ read above notice before touching this!
405393
wasm-bindgen-futures = "0.4.50"
406394
wayland-sys = "0.31.7"
407395
web-sys = "0.3.77"
@@ -550,10 +538,10 @@ debug-assertions = false
550538
panic = "abort" # This leads to better optimizations and smaller binaries (and is the default in Wasm anyways).
551539

552540
[profile.web-release]
553-
panic = 'abort' # Removes panic handling code
541+
panic = 'abort' # Removes panic handling code
554542
inherits = "release"
555543
lto = true
556-
opt-level = 'z' # Optimize for size
544+
opt-level = 'z' # Optimize for size
557545
codegen-units = 1
558546

559547

@@ -619,11 +607,11 @@ cloned_instead_of_copied = "warn"
619607
dbg_macro = "warn"
620608
debug_assert_with_mut_call = "warn"
621609
derive_partial_eq_without_eq = "warn"
622-
disallowed_macros = "warn" # See clippy.toml
623-
disallowed_methods = "warn" # See clippy.toml
624-
disallowed_names = "warn" # See clippy.toml
625-
disallowed_script_idents = "warn" # See clippy.toml
626-
disallowed_types = "warn" # See clippy.toml
610+
disallowed_macros = "warn" # See clippy.toml
611+
disallowed_methods = "warn" # See clippy.toml
612+
disallowed_names = "warn" # See clippy.toml
613+
disallowed_script_idents = "warn" # See clippy.toml
614+
disallowed_types = "warn" # See clippy.toml
627615
doc_comment_double_space_linebreaks = "warn"
628616
doc_include_without_cfg = "warn"
629617
doc_link_with_quotes = "warn"
@@ -677,7 +665,7 @@ manual_instant_elapsed = "warn"
677665
manual_is_power_of_two = "warn"
678666
manual_is_variant_and = "warn"
679667
manual_let_else = "warn"
680-
manual_midpoint = "warn" # NOTE using `midpoint` is nicer for readability, but slower for floats
668+
manual_midpoint = "warn" # NOTE using `midpoint` is nicer for readability, but slower for floats
681669
manual_ok_or = "warn"
682670
manual_string_new = "warn"
683671
map_err_ignore = "warn"
@@ -768,8 +756,8 @@ zero_sized_map_values = "warn"
768756
#self_named_module_files = "warn"
769757

770758
manual_range_contains = "allow" # this one is just worse imho
771-
map_unwrap_or = "allow" # so is this one
772-
ref_patterns = "allow" # It's nice to avoid ref pattern, but there are some situations that are hard (impossible?) to express without.
759+
map_unwrap_or = "allow" # so is this one
760+
ref_patterns = "allow" # It's nice to avoid ref pattern, but there are some situations that are hard (impossible?) to express without.
773761

774762
# TODO(emilk): enable more of these lints:
775763
allow_attributes = "allow"
@@ -778,7 +766,7 @@ let_underscore_untyped = "allow"
778766
missing_assert_message = "allow"
779767
missing_errors_doc = "allow"
780768
ref_option = "allow"
781-
significant_drop_tightening = "allow" # An update of parking_lot made this trigger in a lot of places. TODO(emilk): fix those places
769+
significant_drop_tightening = "allow" # An update of parking_lot made this trigger in a lot of places. TODO(emilk): fix those places
782770
unnecessary_debug_formatting = "allow"
783771

784772
[patch.crates-io]

bacon.toml

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,7 @@ default_job = "clippy"
66
[jobs]
77

88
[jobs.clippy]
9-
command = [
10-
"cargo",
11-
"clippy",
12-
"--all-targets",
13-
"--all-features",
14-
"--color=always",
15-
]
9+
command = ["cargo", "clippy", "--all-targets", "--all-features", "--color=always"]
1610
need_stdout = false
1711
watch = ["tests", "benches", "examples"]
1812

@@ -35,13 +29,7 @@ need_stdout = false
3529
watch = ["tests", "benches", "examples"]
3630

3731
[jobs.check]
38-
command = [
39-
"cargo",
40-
"check",
41-
"--all-targets",
42-
"--all-features",
43-
"--color=always",
44-
]
32+
command = ["cargo", "check", "--all-targets", "--all-features", "--color=always"]
4533
need_stdout = false
4634
watch = ["tests", "benches", "examples"]
4735

@@ -70,14 +58,7 @@ need_stdout = false
7058
# if the doc compiles, then it opens in your browser and bacon switches
7159
# to the previous job
7260
[jobs.doc-open]
73-
command = [
74-
"cargo",
75-
"doc",
76-
"--color=always",
77-
"--all-features",
78-
"--no-deps",
79-
"--open",
80-
]
61+
command = ["cargo", "doc", "--color=always", "--all-features", "--no-deps", "--open"]
8162
need_stdout = false
8263
on_success = "back" # so that we don't open the browser at each change
8364

crates/build/re_protos_builder/Cargo.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,5 @@ re_log = { workspace = true, features = ["setup"] }
2626

2727
# External
2828
camino.workspace = true
29-
tonic-build = { workspace = true, default-features = false, features = [
30-
"prost",
31-
] }
29+
tonic-build = { workspace = true, default-features = false, features = ["prost"] }
3230
prost-build.workspace = true

crates/store/re_data_source/Cargo.toml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,7 @@ re_data_loader.workspace = true
2727
re_error.workspace = true
2828
re_redap_client.workspace = true
2929
re_grpc_client.workspace = true
30-
re_log_encoding = { workspace = true, features = [
31-
"decoder",
32-
"stream_from_http",
33-
] }
30+
re_log_encoding = { workspace = true, features = ["decoder", "stream_from_http"] }
3431
re_log_types.workspace = true
3532
re_log.workspace = true
3633
re_smart_channel.workspace = true

crates/store/re_grpc_client/Cargo.toml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,7 @@ web-time.workspace = true
4242
# Native dependencies:
4343
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
4444
tokio = { workspace = true, features = ["rt", "rt-multi-thread"] }
45-
tonic = { workspace = true, default-features = false, features = [
46-
"transport",
47-
"tls-native-roots",
48-
] }
45+
tonic = { workspace = true, default-features = false, features = ["transport", "tls-native-roots"] }
4946

5047
# Web dependencies:
5148
[target.'cfg(target_arch = "wasm32")'.dependencies]

crates/store/re_grpc_server/Cargo.toml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,7 @@ anyhow.workspace = true
3939
crossbeam.workspace = true
4040
itertools.workspace = true
4141
parking_lot.workspace = true
42-
tonic = { workspace = true, default-features = false, features = [
43-
"transport",
44-
"router",
45-
] }
42+
tonic = { workspace = true, default-features = false, features = ["transport", "router"] }
4643
tonic-web.workspace = true
4744
tower-http = { workspace = true, features = ["cors"] }
4845

crates/store/re_log_encoding/Cargo.toml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,7 @@ default = []
2424
testing = []
2525

2626
## Enable loading data from an .rrd file.
27-
decoder = [
28-
"re_log_types/serde",
29-
"dep:bytes",
30-
"dep:lz4_flex",
31-
"dep:tokio",
32-
"dep:tokio-stream",
33-
]
27+
decoder = ["re_log_types/serde", "dep:bytes", "dep:lz4_flex", "dep:tokio", "dep:tokio-stream"]
3428

3529
## Enable encoding of log messages to an .rrd file/stream.
3630
encoder = ["dep:lz4_flex", "re_log_types/serde"]
@@ -77,10 +71,7 @@ web-time = { workspace = true, optional = true }
7771
js-sys = { workspace = true, optional = true }
7872
wasm-bindgen = { workspace = true, optional = true }
7973
wasm-bindgen-futures = { workspace = true, optional = true }
80-
web-sys = { workspace = true, optional = true, features = [
81-
"Window",
82-
"MessageEvent",
83-
] }
74+
web-sys = { workspace = true, optional = true, features = ["Window", "MessageEvent"] }
8475

8576
[dev-dependencies]
8677
re_types.workspace = true

crates/store/re_log_types/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ all-features = true
2121
[package.metadata.cargo-shear]
2222
ignored = [
2323
"num-traits", # Needed for `num-derive`'s macros to work.
24-
"half", # Needed so that `fixed` is pinned at the right version.
24+
"half", # Needed so that `fixed` is pinned at the right version.
2525
]
2626

2727

crates/store/re_protos/Cargo.toml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,18 +44,11 @@ url = { workspace = true, features = ["serde"] }
4444

4545
# Native dependencies:
4646
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
47-
tonic = { workspace = true, default-features = false, features = [
48-
"codegen",
49-
"prost",
50-
"transport",
51-
] }
47+
tonic = { workspace = true, default-features = false, features = ["codegen", "prost", "transport"] }
5248

5349
# Web dependencies:
5450
[target.'cfg(target_arch = "wasm32")'.dependencies]
55-
tonic = { workspace = true, default-features = false, features = [
56-
"codegen",
57-
"prost",
58-
] }
51+
tonic = { workspace = true, default-features = false, features = ["codegen", "prost"] }
5952

6053
[lints]
6154
workspace = true

0 commit comments

Comments
 (0)