Merge pull request #580 from elBoberido/iox2-3-small-dependencie-cleanup

[#3] Small dependency cleanup
eclipse-iceoryx · Jan 11, 2025 · df775df · df775df
2 parents 428e09a + cafe053
commit df775df
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 78 deletions.
diff --git a/Cargo.Bazel.lock b/Cargo.Bazel.lock
@@ -1,5 +1,5 @@
 {
-  "checksum": "447043df7c396095966ba37a0c0172c696c643f2396385310bd37bc345318e5e",
+  "checksum": "904dcb8a11d275446a0883d509f57dc79d98a328977a4d37fb7915476bec2922",
   "crates": {
     "addr2line 0.24.2": {
       "name": "addr2line",
@@ -658,7 +658,7 @@
               "target": "backtrace"
             },
             {
-              "id": "console 0.15.8",
+              "id": "console 0.15.10",
               "target": "console"
             }
           ],
@@ -1687,13 +1687,13 @@
       },
       "license": "MPL-2.0"
     },
-    "console 0.15.8": {
+    "console 0.15.10": {
       "name": "console",
-      "version": "0.15.8",
+      "version": "0.15.10",
       "repository": {
         "Http": {
-          "url": "https://static.crates.io/crates/console/0.15.8/download",
-          "sha256": "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
+          "url": "https://static.crates.io/crates/console/0.15.10/download",
+          "sha256": "ea3c6ecd8059b57859df5c69830340ed3c41d30e3da0c1cbed90a96ac853041b"
         }
       },
       "targets": [
@@ -1714,30 +1714,30 @@
         ],
         "deps": {
           "common": [
-            {
-              "id": "lazy_static 1.5.0",
-              "target": "lazy_static"
-            },
             {
               "id": "libc 0.2.159",
               "target": "libc"
+            },
+            {
+              "id": "once_cell 1.20.2",
+              "target": "once_cell"
             }
           ],
           "selects": {
             "cfg(windows)": [
               {
-                "id": "encode_unicode 0.3.6",
+                "id": "encode_unicode 1.0.0",
                 "target": "encode_unicode"
               },
               {
-                "id": "windows-sys 0.52.0",
+                "id": "windows-sys 0.59.0",
                 "target": "windows_sys"
               }
             ]
           }
         },
         "edition": "2018",
-        "version": "0.15.8"
+        "version": "0.15.10"
       },
       "license": "MIT"
     },
@@ -1778,13 +1778,13 @@
       },
       "license": "MIT OR Apache-2.0"
     },
-    "encode_unicode 0.3.6": {
+    "encode_unicode 1.0.0": {
       "name": "encode_unicode",
-      "version": "0.3.6",
+      "version": "1.0.0",
       "repository": {
         "Http": {
-          "url": "https://static.crates.io/crates/encode_unicode/0.3.6/download",
-          "sha256": "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
+          "url": "https://static.crates.io/crates/encode_unicode/1.0.0/download",
+          "sha256": "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"
         }
       },
       "targets": [
@@ -1810,10 +1810,10 @@
           ],
           "selects": {}
         },
-        "edition": "2015",
-        "version": "0.3.6"
+        "edition": "2021",
+        "version": "1.0.0"
       },
-      "license": "MIT/Apache-2.0"
+      "license": "Apache-2.0 OR MIT"
     },
     "enum-iterator 2.1.0": {
       "name": "enum-iterator",
@@ -2016,7 +2016,7 @@
         "compile_data_glob": [
           "**"
         ],
-        "deps": {
+        "deps_dev": {
           "common": [
             {
               "id": "clap 4.5.19",
@@ -2472,22 +2472,10 @@
         ],
         "deps": {
           "common": [
-            {
-              "id": "cdr 0.2.4",
-              "target": "cdr"
-            },
-            {
-              "id": "lazy_static 1.5.0",
-              "target": "lazy_static"
-            },
             {
               "id": "serde 1.0.210",
               "target": "serde"
             },
-            {
-              "id": "sha1_smol 1.0.1",
-              "target": "sha1_smol"
-            },
             {
               "id": "tiny-fn 0.1.7",
               "target": "tiny_fn"
@@ -2738,19 +2726,6 @@
         "compile_data_glob": [
           "**"
         ],
-        "deps": {
-          "common": [
-            {
-              "id": "lazy_static 1.5.0",
-              "target": "lazy_static"
-            },
-            {
-              "id": "tiny-fn 0.1.7",
-              "target": "tiny_fn"
-            }
-          ],
-          "selects": {}
-        },
         "edition": "2021",
         "version": "0.5.0"
       },
@@ -2959,10 +2934,6 @@
               "id": "cdr 0.2.4",
               "target": "cdr"
             },
-            {
-              "id": "lazy_static 1.5.0",
-              "target": "lazy_static"
-            },
             {
               "id": "once_cell 1.20.2",
               "target": "once_cell"
@@ -2990,6 +2961,15 @@
           ],
           "selects": {}
         },
+        "deps_dev": {
+          "common": [
+            {
+              "id": "lazy_static 1.5.0",
+              "target": "lazy_static"
+            }
+          ],
+          "selects": {}
+        },
         "edition": "2021",
         "proc_macro_deps_dev": {
           "common": [
@@ -6498,8 +6478,6 @@
           "common": [
             "Win32",
             "Win32_Foundation",
-            "Win32_Storage",
-            "Win32_Storage_FileSystem",
             "Win32_System",
             "Win32_System_Console",
             "Win32_System_LibraryLoader",
@@ -6508,8 +6486,6 @@
             "Win32_System_SystemServices",
             "Win32_System_Threading",
             "Win32_UI",
-            "Win32_UI_Input",
-            "Win32_UI_Input_KeyboardAndMouse",
             "Win32_UI_WindowsAndMessaging",
             "default"
           ],
@@ -6560,6 +6536,11 @@
             "Win32_Foundation",
             "Win32_Storage",
             "Win32_Storage_FileSystem",
+            "Win32_System",
+            "Win32_System_Console",
+            "Win32_UI",
+            "Win32_UI_Input",
+            "Win32_UI_Input_KeyboardAndMouse",
             "default"
           ],
           "selects": {}

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/examples/Cargo.toml b/examples/Cargo.toml
@@ -15,6 +15,8 @@ iceoryx2 = { workspace = true }
 iceoryx2-bb-container = { workspace = true }
 iceoryx2-bb-log = { workspace = true }
 iceoryx2-bb-system-types = { workspace = true }
+
+[dev-dependencies]
 clap = { workspace = true }
 
 [lib]

diff --git a/iceoryx2-bb/memory/BUILD.bazel b/iceoryx2-bb/memory/BUILD.bazel
@@ -28,8 +28,6 @@ rust_library(
         "//iceoryx2-bb/log:iceoryx2-bb-log",
         "//iceoryx2-bb/posix:iceoryx2-bb-posix",
         "//iceoryx2-pal/concurrency-sync:iceoryx2-pal-concurrency-sync",
-        "@crate_index//:lazy_static",
-        "@crate_index//:tiny-fn",
     ],
 )
 

diff --git a/iceoryx2-bb/memory/Cargo.toml b/iceoryx2-bb/memory/Cargo.toml
@@ -17,8 +17,5 @@ iceoryx2-bb-log = { workspace = true }
 iceoryx2-bb-posix = { workspace = true }
 iceoryx2-pal-concurrency-sync = { workspace = true }
 
-tiny-fn = { workspace = true }
-lazy_static = { workspace = true }
-
 [dev-dependencies]
 iceoryx2-bb-testing = { workspace = true }
diff --git a/iceoryx2-cal/BUILD.bazel b/iceoryx2-cal/BUILD.bazel
@@ -38,7 +38,6 @@ rust_library(
         "//iceoryx2-bb/system-types:iceoryx2-bb-system-types",
         "//iceoryx2-pal/concurrency-sync:iceoryx2-pal-concurrency-sync",
         "@crate_index//:cdr",
-        "@crate_index//:lazy_static",
         "@crate_index//:once_cell",
         "@crate_index//:ouroboros",
         "@crate_index//:serde",

diff --git a/iceoryx2-cal/Cargo.toml b/iceoryx2-cal/Cargo.toml
@@ -27,7 +27,6 @@ iceoryx2-bb-lock-free = { workspace = true }
 iceoryx2-pal-concurrency-sync = { workspace = true }
 
 once_cell = { workspace = true }
-lazy_static = { workspace = true }
 serde = { workspace = true }
 cdr = { workspace = true }
 toml = { workspace = true }
@@ -39,3 +38,4 @@ ouroboros = { workspace = true }
 iceoryx2-bb-testing = { workspace = true }
 iceoryx2-pal-posix = { workspace = true }
 generic-tests = { workspace = true }
+lazy_static = { workspace = true }
diff --git a/iceoryx2/BUILD.bazel b/iceoryx2/BUILD.bazel
@@ -48,10 +48,7 @@ rust_library(
         "//iceoryx2-bb/system-types:iceoryx2-bb-system-types",
         "//iceoryx2-cal:iceoryx2-cal",
         "//iceoryx2-pal/concurrency-sync:iceoryx2-pal-concurrency-sync",
-        "@crate_index//:cdr",
-        "@crate_index//:lazy_static",
         "@crate_index//:serde",
-        "@crate_index//:sha1_smol",
         "@crate_index//:tiny-fn",
         "@crate_index//:toml",
     ],

diff --git a/iceoryx2/Cargo.toml b/iceoryx2/Cargo.toml
@@ -33,11 +33,8 @@ iceoryx2-bb-elementary = { workspace = true }
 iceoryx2-cal = { workspace = true }
 iceoryx2-pal-concurrency-sync = { workspace = true }
 
-lazy_static = { workspace = true }
 serde = { workspace = true }
-cdr = { workspace = true }
 toml = { workspace = true }
-sha1_smol = { workspace = true }
 tiny-fn = { workspace = true }
 
 [dev-dependencies]