Merge pull request RustPython#4482 from youknowone/workspace-deps

Use workspace dependencies to prevent version fragments

Author: youknowone

Cargo.lock

@@ -18,6 +18,45 @@ members = [
     ".", "common", "derive", "jit", "vm", "pylib", "stdlib", "wasm/lib", "derive-impl",
 ]
 
+[workspace.dependencies]
+ahash = "0.7.6"
+anyhow = "1.0.45"
+ascii = "1.0"
+atty = "0.2.14"
+bincode = "1.3.3"
+bitflags = "1.3.2"
+bstr = "0.2.17"
+cfg-if = "1.0"
+chrono = "0.4.19"
+crossbeam-utils = "0.8.9"
+flame = "0.2.2"
+glob = "0.3"
+hex = "0.4.3"
+indexmap = "1.8.1"
+insta = "1.14.0"
+itertools = "0.10.3"
+libc = "0.2.133"
+log = "0.4.16"
+nix = "0.24"
+num-complex = "0.4.0"
+num-bigint = "0.4.3"
+num-integer = "0.1.44"
+num-rational = "0.4.0"
+num-traits = "0.2"
+num_enum = "0.5.7"
+once_cell = "1.13"
+parking_lot = "0.12"
+paste = "1.0.7"
+rand = "0.8.5"
+rustyline = "10.0.0"
+serde = "1.0"
+schannel = "0.1.19"
+static_assertions = "1.1"
+syn = "1.0.91"
+thiserror = "1.0"
+thread_local = "1.1.4"
+widestring = "0.5.1"
+
 [features]
 default = ["threading", "stdlib", "zlib", "importlib", "encodings", "rustpython-parser/lalrpop"]
 importlib = ["rustpython-vm/importlib"]
@@ -39,19 +78,21 @@ rustpython-pylib = { path = "pylib", optional = true, default-features = false }
 rustpython-stdlib = { path = "stdlib", optional = true, default-features = false }
 rustpython-vm = { path = "vm", version = "0.2.0", default-features = false, features = ["compiler"] }
 
-cfg-if = "1.0.0"
+atty = { workspace = true }
+cfg-if = { workspace = true }
+log = { workspace = true }
+flame = { workspace = true, optional = true }
+
 clap = "2.34"
 dirs = { package = "dirs-next", version = "2.0.0" }
 env_logger = { version = "0.9.0", default-features = false, features = ["atty", "termcolor"] }
-flame = { version = "0.2.2", optional = true }
 flamescope = { version = "0.1.2", optional = true }
-libc = "0.2.133"
-log = "0.4.16"
-num-traits = "0.2.14"
-atty = "0.2.14"
+
+[target.'cfg(windows)'.dependencies]
+libc = { workspace = true }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-rustyline = "10.0.0"
+rustyline = { workspace = true }
 
 [dev-dependencies]
 cpython = "0.7.0"

Cargo.toml

@@ -11,24 +11,25 @@ license = "MIT"
 threading = ["parking_lot"]
 
 [dependencies]
-ascii = "1.0"
-bitflags = "1.3.2"
-cfg-if = "1.0"
+ascii = { workspace = true }
+bitflags = { workspace = true }
+cfg-if = { workspace = true }
+itertools = { workspace = true }
+libc = { workspace = true }
+num-bigint = { workspace = true }
+num-complex = { workspace = true }
+num-traits = { workspace = true }
+once_cell = { workspace = true }
+parking_lot = { workspace = true, optional = true }
+rand = { workspace = true }
+
 hexf-parse = "0.2.1"
-itertools = "0.10.3"
 lexical-parse-float = { version = "0.8.0", features = ["format"] }
-libc = "0.2.133"
 lock_api = "0.4"
-num-bigint = "0.4.2"
-num-complex = "0.4.0"
-num-traits = "0.2"
-once_cell = "1.4.1"
-parking_lot = { version = "0.12.0", optional = true }
 radium = "0.7"
-rand = "0.8"
 siphasher = "0.3"
 unic-ucd-category = "0.9"
 volatile = "0.3"
 
 [target.'cfg(windows)'.dependencies]
-widestring = "0.5.1"
+widestring = { workspace = true }

common/Cargo.toml

@@ -10,4 +10,4 @@ rustpython-compiler-core = { path = "core" }
 rustpython-codegen = { path = "codegen" }
 rustpython-parser = { path = "parser" }
 
-thiserror = "1.0"
+thiserror = { workspace = true }

compiler/Cargo.toml

@@ -14,6 +14,7 @@ fold = []
 unparse = ["rustpython-common"]
 
 [dependencies]
-num-bigint = "0.4.3"
 rustpython-compiler-core = { path = "../core", version = "0.2.0" }
 rustpython-common = { path = "../../common", version = "0.2.0", optional = true }
+
+num-bigint = { workspace = true }

compiler/ast/Cargo.toml

@@ -11,16 +11,16 @@ edition = "2021"
 rustpython-ast = { path = "../ast", features = ["unparse"] }
 rustpython-compiler-core = { path = "../core", version = "0.2.0" }
 
-ahash = "0.7.6"
-bitflags = "1.3.2"
-indexmap = "1.8.1"
-itertools = "0.10.3"
-log = "0.4.16"
-num-complex = { version = "0.4.0", features = ["serde"] }
-num-traits = "0.2.14"
-thiserror = "1.0"
+ahash = { workspace = true }
+bitflags = { workspace = true }
+indexmap = { workspace = true }
+itertools = { workspace = true }
+log = { workspace = true }
+num-complex = { workspace = true, features = ["serde"] }
+num-traits = { workspace = true }
+thiserror = { workspace = true }
 
 [dev-dependencies]
 rustpython-parser = { path = "../parser" }
 
-insta = "1.14.0"
+insta = { workspace = true }

compiler/codegen/Cargo.toml

@@ -8,13 +8,14 @@ repository = "https://github.com/RustPython/RustPython"
 license = "MIT"
 
 [dependencies]
-bincode = "1.3.3"
-bitflags = "1.3.2"
-bstr = "0.2.17"
-itertools = "0.10.3"
+bincode = { workspace = true }
+bitflags = { workspace = true }
+bstr = { workspace = true }
+itertools = { workspace = true }
+num-bigint = { workspace = true, features = ["serde"] }
+num-complex = { workspace = true, features = ["serde"] }
+num_enum = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
+thiserror = { workspace = true }
+
 lz4_flex = "0.9.2"
-num-bigint = { version = "0.4.3", features = ["serde"] }
-num-complex = { version = "0.4.0", features = ["serde"] }
-num_enum = "0.5.7"
-serde = { version = "1.0.136", features = ["derive"] }
-thiserror = "1.0"

compiler/core/Cargo.toml

@@ -12,7 +12,7 @@ edition = "2021"
 default = ["lalrpop"]  # removing this causes potential build failure
 
 [build-dependencies]
-anyhow = "1.0.45"
+anyhow = { workspace = true }
 lalrpop = { version = "0.19.8", optional = true }
 phf_codegen = "0.11.1"
 tiny-keccak = { version = "2", features = ["sha3"] }
@@ -21,18 +21,19 @@ tiny-keccak = { version = "2", features = ["sha3"] }
 rustpython-ast = { path = "../ast", version = "0.2.0" }
 rustpython-compiler-core = { path = "../core", version = "0.2.0" }
 
-ahash = "0.7.6"
-itertools = "0.10.3"
-lalrpop-util = "0.19.8"
-log = "0.4.16"
-num-bigint = "0.4.3"
-num-traits = "0.2.14"
-phf = "0.11.1"
-rustc-hash = "1.1.0"
-thiserror = "1.0"
+ahash = { workspace = true }
+itertools = { workspace = true }
+log = { workspace = true }
+num-bigint = { workspace = true }
+num-traits = { workspace = true }
+thiserror = { workspace = true }
+
 unic-emoji-char = "0.9.0"
 unic-ucd-ident  = "0.9.0"
 unicode_names2 = "0.5.0"
+lalrpop-util = "0.19.8"
+phf = "0.11.1"
+rustc-hash = "1.1.0"
 
 [dev-dependencies]
-insta = "1.14.0"
+insta = { workspace = true }

compiler/parser/Cargo.toml

@@ -7,12 +7,13 @@ edition = "2021"
 rustpython-compiler-core = { path = "../compiler/core", version = "0.2.0" }
 rustpython-doc = { git = "https://github.com/RustPython/__doc__", branch = "main" }
 
-indexmap = "1.8.1"
-itertools = "0.10.3"
+indexmap = { workspace = true }
+itertools = { workspace = true }
+once_cell = { workspace = true }
+syn = { workspace = true, features = ["full", "extra-traits"] }
+
 maplit = "1.0.2"
-once_cell = "1.10.0"
 proc-macro2 = "1.0.37"
 quote = "1.0.18"
-syn = { version = "1.0.91", features = ["full", "extra-traits"] }
 syn-ext = { version = "0.4.0", features = ["full"] }
 textwrap = { version = "0.15.0", default-features = false }

derive-impl/Cargo.toml

@@ -13,4 +13,4 @@ proc-macro = true
 [dependencies]
 rustpython-compiler = { path = "../compiler", version = "0.2.0" }
 rustpython-derive-impl = { path = "../derive-impl" }
-syn = "1.0.91"
+syn = { workspace = true }