Convert remaining deps into workspace deps (#11454)

emilk · web-flow · commit e7a425825a96 · 2025-10-08T10:03:45.000+02:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -308,8 +308,9 @@ profiling = { version = "1.0.12", default-features = false }
 prometheus-client = "0.24"
 prost = "0.13.3"
 prost-build = "0.13.3"
-prost-types = "0.13.3"
 prost-reflect = "0.15.3"
+prost-types = "0.13.3"
+protoc-prebuilt = "0.3"
 puffin = "0.19.1"
 puffin_http = "0.16"
 pyo3 = "0.24.1"
diff --git a/crates/build/re_protos_builder/Cargo.toml b/crates/build/re_protos_builder/Cargo.toml
@@ -29,4 +29,4 @@ camino.workspace = true
 tonic-build = { workspace = true, default-features = false, features = [
   "prost",
 ] }
-prost-build = { workspace = true }
+prost-build.workspace = true
diff --git a/examples/rust/animated_urdf/Cargo.toml b/examples/rust/animated_urdf/Cargo.toml
@@ -12,6 +12,6 @@ rerun = { path = "../../../crates/top/rerun", features = [
   "data_loaders",
 ] }
 
-anyhow = "1.0"
-clap = { version = "4.0", features = ["derive"] }
-emath = "0.32.0"
+anyhow.workspace = true
+clap = { workspace = true, features = ["derive"] }
+emath.workspace = true
diff --git a/examples/rust/clock/Cargo.toml b/examples/rust/clock/Cargo.toml
@@ -12,5 +12,5 @@ rerun = { path = "../../../crates/top/rerun", features = [
   "clap",
 ] }
 
-anyhow = "1.0"
-clap = { version = "4.0", features = ["derive"] }
+anyhow.workspace = true
+clap = { workspace = true, features = ["derive"] }
diff --git a/examples/rust/custom_callback/Cargo.toml b/examples/rust/custom_callback/Cargo.toml
@@ -26,16 +26,16 @@ rerun = { path = "../../../crates/top/rerun", default-features = false, features
   "run",
 ] }
 
-bincode = "1.3.3"
-mimalloc = "0.1.43"
-parking_lot = "0.12"
-serde = { version = "1.0.213", features = ["derive"] }
-tokio = { version = "1.14.0", features = [
+bincode.workspace = true
+mimalloc.workspace = true
+parking_lot.workspace = true
+serde = { workspace = true, features = ["derive"] }
+tokio = { workspace = true, features = [
+  "io-util",
   "macros",
-  "rt-multi-thread",
-  "time",
   "net",
-  "io-util",
-  "sync",
+  "rt-multi-thread",
   "signal",
+  "sync",
+  "time",
 ] }
diff --git a/examples/rust/custom_view/Cargo.toml b/examples/rust/custom_view/Cargo.toml
@@ -20,4 +20,4 @@ rerun = { path = "../../../crates/top/rerun", default-features = false, features
 ] }
 
 # mimalloc is a much faster allocator:
-mimalloc = "0.1.43"
+mimalloc.workspace = true
diff --git a/examples/rust/dataframe_query/Cargo.toml b/examples/rust/dataframe_query/Cargo.toml
@@ -11,5 +11,5 @@ rerun = { path = "../../../crates/top/rerun", default-features = false, features
   "dataframe",
 ] }
 
-itertools = "0.14"
-unindent = "0.2"
+itertools.workspace = true
+unindent.workspace = true
diff --git a/examples/rust/dna/Cargo.toml b/examples/rust/dna/Cargo.toml
@@ -9,5 +9,5 @@ publish = false
 [dependencies]
 rerun = { path = "../../../crates/top/rerun" }
 
-itertools = "0.14"
-rand = "0.8"
+itertools.workspace = true
+rand = { workspace = true, features = ["std"] }
diff --git a/examples/rust/extend_viewer_ui/Cargo.toml b/examples/rust/extend_viewer_ui/Cargo.toml
@@ -20,4 +20,4 @@ rerun = { path = "../../../crates/top/rerun", default-features = false, features
 ] }
 
 # mimalloc is a much faster allocator:
-mimalloc = "0.1.43"
+mimalloc.workspace = true
diff --git a/examples/rust/external_data_loader/Cargo.toml b/examples/rust/external_data_loader/Cargo.toml
@@ -11,5 +11,5 @@ rerun = { path = "../../../crates/top/rerun", default-features = false, features
   "sdk",
 ] }
 
-anyhow = "1.0"
-argh = "0.1"
+anyhow.workspace = true
+argh.workspace = true
diff --git a/examples/rust/graph_lattice/Cargo.toml b/examples/rust/graph_lattice/Cargo.toml
@@ -9,6 +9,6 @@ publish = false
 [dependencies]
 rerun = { path = "../../../crates/top/rerun", features = ["clap"] }
 
-anyhow = "1.0"
-clap = { version = "4.0", features = ["derive"] }
-itertools = "0.14"
+anyhow.workspace = true
+clap = { workspace = true, features = ["derive"] }
+itertools.workspace = true
diff --git a/examples/rust/incremental_logging/Cargo.toml b/examples/rust/incremental_logging/Cargo.toml
@@ -12,6 +12,6 @@ rerun = { path = "../../../crates/top/rerun", features = [
   "clap",
 ] }
 
-anyhow = "1.0"
-clap = { version = "4.0", features = ["derive"] }
-rand = "0.8"
+anyhow.workspace = true
+clap = { workspace = true, features = ["derive"] }
+rand = { workspace = true, features = ["std"] }
diff --git a/examples/rust/log_file/Cargo.toml b/examples/rust/log_file/Cargo.toml
@@ -12,5 +12,5 @@ rerun = { path = "../../../crates/top/rerun", features = [
   "clap",
 ] }
 
-anyhow = "1.0"
-clap = { version = "4.0", features = ["derive"] }
+anyhow.workspace = true
+clap = { workspace = true, features = ["derive"] }
diff --git a/examples/rust/minimal_options/Cargo.toml b/examples/rust/minimal_options/Cargo.toml
@@ -12,6 +12,6 @@ rerun = { path = "../../../crates/top/rerun", features = [
   "clap",
 ] }
 
-anyhow = "1.0"
-clap = { version = "4.0", features = ["derive"] }
-glam = "0.30"
+anyhow.workspace = true
+clap = { workspace = true, features = ["derive"] }
+glam.workspace = true
diff --git a/examples/rust/objectron/Cargo.toml b/examples/rust/objectron/Cargo.toml
@@ -13,13 +13,13 @@ rerun = { path = "../../../crates/top/rerun", features = [
   "clap",
 ] }
 
-anyhow = "1.0"
-clap = { version = "4.0", features = ["derive"] }
-glam = "0.30"
-prost = "0.13"
+anyhow.workspace = true
+clap = { workspace = true, features = ["derive"] }
+glam.workspace = true
+prost.workspace = true
 
 
 [build-dependencies]
 re_build_tools = { path = "../../../crates/build/re_build_tools" }
-prost-build = "0.13"
-protoc-prebuilt = "0.3"
+prost-build.workspace = true
+protoc-prebuilt.workspace = true
diff --git a/examples/rust/raw_mesh/Cargo.toml b/examples/rust/raw_mesh/Cargo.toml
@@ -13,7 +13,7 @@ rerun = { path = "../../../crates/top/rerun", features = [
   "ecolor",
 ] }
 
-anyhow = "1.0"
-bytes = "1.3"
-clap = { version = "4.0", features = ["derive"] }
-gltf = "1.1"
+anyhow.workspace = true
+bytes.workspace = true
+clap = { workspace = true, features = ["derive"] }
+gltf.workspace = true
diff --git a/examples/rust/viewer_callbacks/Cargo.toml b/examples/rust/viewer_callbacks/Cargo.toml
@@ -19,4 +19,4 @@ rerun = { path = "../../../crates/top/rerun", default-features = false, features
 ] }
 
 # mimalloc is a much faster allocator:
-mimalloc = "0.1.43"
+mimalloc.workspace = true
diff --git a/rerun_py/Cargo.toml b/rerun_py/Cargo.toml
@@ -66,7 +66,7 @@ re_redap_client.workspace = true
 re_grpc_client.workspace = true
 re_grpc_server = { workspace = true, optional = true }
 re_log = { workspace = true, features = ["setup"] }
-re_log_encoding = { workspace = true }
+re_log_encoding.workspace = true
 re_log_types.workspace = true
 re_memory.workspace = true
 re_sdk = { workspace = true, features = ["data_loaders"] }
diff --git a/scripts/lint.py b/scripts/lint.py
@@ -585,88 +585,6 @@ def test_lint_vertical_spacing() -> None:
 # -----------------------------------------------------------------------------
 
 
-re_workspace_dep = re.compile(r"workspace\s*=\s*(true|false)")
-
-
-def lint_workspace_deps(lines_in: list[str]) -> tuple[list[str], list[str]]:
-    """Only for Cargo files."""
-
-    errors = []
-    lines_out = []
-
-    for line_nr, line in enumerate(lines_in):
-        line_nr = line_nr + 1
-
-        if re_workspace_dep.search(line):
-            errors.append(f"{line_nr}: Rust examples should never depend on workspace information (`{line.strip()}`)")
-            lines_out.append("\n")
-
-        lines_out.append(line)
-
-    return errors, lines_out
-
-
-def test_lint_workspace_deps() -> None:
-    assert re_workspace_dep.search("workspace=true")
-    assert re_workspace_dep.search("workspace=false")
-    assert re_workspace_dep.search('xxx = { xxx: "yyy", workspace = true }')
-    assert re_workspace_dep.search('xxx = { xxx: "yyy", workspace = false }')
-
-    should_pass = [
-        "hello world",
-        """
-        [package]
-        name = "clock"
-        version = "0.6.0-alpha.0"
-        edition = "2024"
-        rust-version = "1.88"
-        license = "MIT OR Apache-2.0"
-        publish = false
-
-        [dependencies]
-        rerun = { path = "../../../crates/top/rerun", features = ["web_viewer"] }
-
-        anyhow = "1.0"
-        clap = { version = "4.0", features = ["derive"] }
-        glam = "0.30"
-        """,
-    ]
-
-    should_fail = [
-        """
-        [package]
-        name = "objectron"
-        version.workspace = true
-        edition.workspace = true
-        rust-version.workspace = true
-        license.workspace = true
-        publish = false
-
-        [dependencies]
-        rerun = { workspace = true, features = ["web_viewer"] }
-
-        anyhow.workspace = true
-        clap = { workspace = true, features = ["derive"] }
-        glam.workspace = true
-        prost = "0.11"
-
-        [build-dependencies]
-        prost-build = "0.11"
-        """,
-    ]
-
-    for code in should_pass:
-        errors, _ = lint_workspace_deps(code.split("\n"))
-        assert len(errors) == 0, f"expected this to pass:\n{code}\ngot: {errors}"
-
-    for code in should_fail:
-        errors, _ = lint_workspace_deps(code.split("\n"))
-        assert len(errors) > 0, f"expected this to fail:\n{code}"
-
-
-# -----------------------------------------------------------------------------
-
-
 workspace_lints = re.compile(r"\[lints\]\nworkspace\s*=\s*true")
 
 
@@ -1211,16 +1129,6 @@ def lint_file(filepath: str, args: Any) -> int:
         elif 0 < num_errors:
             print(f"Run with --fix to automatically fix {num_errors} errors.")
 
-    if filepath.startswith("./examples/rust") and filepath.endswith("Cargo.toml"):
-        errors, lines_out = lint_workspace_deps(source.lines)
-
-        for error in errors:
-            print(source.error(error))
-        num_errors += len(errors)
-
-        if args.fix:
-            source.rewrite(lines_out)
-
     if not filepath.startswith("./examples/rust") and filepath != "./Cargo.toml" and filepath.endswith("Cargo.toml"):
         error = lint_workspace_lints(source.content)
 
@@ -1277,7 +1185,6 @@ def main() -> None:
     test_split_words()
     test_lint_line()
     test_lint_vertical_spacing()
-    test_lint_workspace_deps()
     test_lint_pyclass_eq()
     test_is_emoji()
 
diff --git a/tests/rust/plot_dashboard_stress/Cargo.toml b/tests/rust/plot_dashboard_stress/Cargo.toml
@@ -19,5 +19,5 @@ rerun = { path = "../../../crates/top/rerun", features = ["clap"] }
 
 anyhow.workspace = true
 clap = { workspace = true, features = ["derive"] }
-rand.workspace = true
+rand = { workspace = true, features = ["std"] }
 rand_distr.workspace = true
diff --git a/tests/rust/test_api/Cargo.toml b/tests/rust/test_api/Cargo.toml
@@ -22,4 +22,4 @@ glam.workspace = true
 itertools.workspace = true
 ndarray.workspace = true
 ndarray-rand.workspace = true
-rand.workspace = true
+rand = { workspace = true, features = ["std"] }
