Skip to content

Commit 56a5549

Browse files
bilelmoussaouibilelmoussaoui
committed
Use cargo workspace features
1 parent c7ef86e commit 56a5549

File tree

20 files changed

+416
-328
lines changed

20 files changed

+416
-328
lines changed

‎Cargo.lock‎

Lines changed: 96 additions & 103 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,32 @@ members = [
2323
]
2424

2525
exclude = ["gir", "checker"]
26+
27+
[workspace.package]
28+
homepage = "https://gtk-rs.org/"
29+
authors = ["The gtk-rs Project Developers"]
30+
version = "0.19.0"
31+
repository = "https://github.com/gtk-rs/gtk-rs-core"
32+
license = "MIT"
33+
exclude = [
34+
"gir-files/*",
35+
]
36+
edition = "2021"
37+
rust-version = "1.70"
38+
39+
[workspace.dependencies]
40+
once_cell = "1.19"
41+
libc = "0.2"
42+
bitflags = "2.4"
43+
thiserror = "1"
44+
gir-format-check = "^0.1"
45+
glib = { path = "glib" }
46+
gio = { path = "gio" }
47+
pango = { path = "pango" }
48+
cairo-rs = { path = "cairo" }
49+
glib-macros = { path = "glib-macros" }
50+
51+
[workspace.metadata.docs.rs]
52+
all-features = true
53+
rustc-args = ["--cfg", "docsrs"]
54+
rustdoc-args = ["--cfg", "docsrs", "--generate-link-to-definition"]

‎cairo/Cargo.toml‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
[package]
22
name = "cairo-rs"
3-
license = "MIT"
4-
homepage = "https://gtk-rs.org/"
5-
authors = ["The gtk-rs Project Developers"]
63
keywords = ["cairo", "gtk-rs", "gnome", "GUI"]
74
readme = "README.md"
85
documentation = "https://gtk-rs.org/gtk-rs-core/stable/latest/docs/cairo/"
9-
version = "0.19.0"
106
description = "Rust bindings for the Cairo library"
11-
repository = "https://github.com/gtk-rs/gtk-rs-core"
12-
edition = "2021"
13-
rust-version = "1.70"
7+
authors.workspace = true
8+
edition.workspace = true
9+
exclude.workspace = true
10+
homepage.workspace = true
11+
license.workspace = true
12+
repository.workspace = true
13+
rust-version.workspace = true
14+
version.workspace = true
1415

1516
[lib]
1617
name = "cairo"
@@ -30,21 +31,16 @@ xcb = ["ffi/xcb"]
3031
xlib = ["ffi/xlib"]
3132
win32-surface = ["ffi/win32-surface"]
3233

33-
[package.metadata.docs.rs]
34-
all-features = true
35-
rustc-args = ["--cfg", "docsrs"]
36-
rustdoc-args = ["--cfg", "docsrs", "--generate-link-to-definition"]
37-
3834
[dependencies.glib]
3935
optional = true
4036
path = "../glib"
4137

4238
[dependencies]
4339
ffi = { package = "cairo-sys-rs", path = "sys" }
44-
libc = "0.2"
45-
bitflags = "2.4"
46-
thiserror = "1.0.56"
47-
once_cell = "1"
40+
libc.workspace = true
41+
bitflags.workspace = true
42+
thiserror.workspace = true
43+
once_cell.workspace = true
4844
freetype-rs = { version = "0.35", optional = true }
4945

5046
[dev-dependencies]

‎cairo/sys/Cargo.toml‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
[package]
22
name = "cairo-sys-rs"
3-
license = "MIT"
4-
authors = ["The gtk-rs Project Developers"]
5-
homepage = "https://gtk-rs.org/"
63
description = "FFI bindings to libcairo"
7-
version = "0.19.0"
84
keywords = ["cairo", "ffi", "gtk-rs", "gnome"]
9-
repository = "https://github.com/gtk-rs/gtk-rs-core"
105
build = "build.rs"
11-
edition = "2021"
12-
rust-version = "1.70"
6+
authors.workspace = true
7+
edition.workspace = true
8+
exclude.workspace = true
9+
homepage.workspace = true
10+
license.workspace = true
11+
repository.workspace = true
12+
rust-version.workspace = true
13+
version.workspace = true
1314

1415
[package.metadata.system-deps.cairo]
1516
name = "cairo"
@@ -67,9 +68,3 @@ windows-sys = { version = "0.52", features = ["Win32_Graphics_Gdi"], optional =
6768

6869
[build-dependencies]
6970
system-deps = "6"
70-
71-
[package.metadata.docs.rs]
72-
all-features = true
73-
rustc-args = ["--cfg", "docsrs"]
74-
rustdoc-args = ["--cfg", "docsrs"]
75-
features = []

‎examples/Cargo.toml‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
11
[package]
22
name = "gtk-rs-examples"
3-
version = "0.0.1"
4-
authors = ["The gtk-rs Project Developers"]
5-
edition = "2021"
6-
rust-version = "1.70"
3+
authors.workspace = true
4+
edition.workspace = true
5+
rust-version.workspace = true
6+
version.workspace = true
77

88
[dependencies]
99
futures = "0.3"
1010
futures-channel = "0.3"
1111
futures-util = "0.3"
12-
13-
[dependencies.glib]
14-
path = "../glib"
15-
16-
[dependencies.gio]
17-
path = "../gio"
12+
glib.workspace = true
13+
gio.workspace = true
1814

1915
[dependencies.async-tls]
2016
version = "0.12"

‎gdk-pixbuf/Cargo.toml‎

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
[package]
22
name = "gdk-pixbuf"
3-
license = "MIT"
4-
homepage = "https://gtk-rs.org/"
5-
authors = ["The gtk-rs Project Developers"]
63
keywords = ["gdk-pixbuf", "gtk-rs", "gnome"]
74
readme = "README.md"
85
documentation = "https://gtk-rs.org/gtk-rs-core/stable/latest/docs/gdk_pixbuf/"
9-
version = "0.19.0"
106
description = "Rust bindings for the GdkPixbuf library"
11-
repository = "https://github.com/gtk-rs/gtk-rs-core"
12-
exclude = [
13-
"gir-files/*",
14-
]
15-
edition = "2021"
16-
rust-version = "1.70"
7+
authors.workspace = true
8+
edition.workspace = true
9+
exclude.workspace = true
10+
homepage.workspace = true
11+
license.workspace = true
12+
repository.workspace = true
13+
rust-version.workspace = true
14+
version.workspace = true
1715

1816
[lib]
1917
name = "gdk_pixbuf"
@@ -22,17 +20,12 @@ name = "gdk_pixbuf"
2220
v2_40 = ["ffi/v2_40"]
2321
v2_42 = ["v2_40", "ffi/v2_42"]
2422

25-
[package.metadata.docs.rs]
26-
all-features = true
27-
rustc-args = ["--cfg", "docsrs"]
28-
rustdoc-args = ["--cfg", "docsrs", "--generate-link-to-definition"]
29-
3023
[dependencies]
31-
libc = "0.2"
3224
ffi = { package = "gdk-pixbuf-sys", path = "sys" }
33-
glib = { path = "../glib" }
34-
gio = { path = "../gio" }
35-
once_cell = "1"
25+
libc.workspace = true
26+
glib.workspace = true
27+
gio.workspace = true
28+
once_cell.workspace = true
3629

3730
[dev-dependencies]
38-
gir-format-check = "^0.1"
31+
gir-format-check.workspace = true

‎gdk-pixbuf/sys/Cargo.toml‎

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,34 @@ v2_42 = ["v2_40"]
2828
name = "gdk_pixbuf_sys"
2929

3030
[package]
31-
authors = ["The gtk-rs Project Developers"]
3231
build = "build.rs"
3332
description = "FFI bindings to libgdk_pixbuf-2.0"
34-
homepage = "https://gtk-rs.org/"
3533
keywords = ["gdk-pixbuf", "ffi", "gtk-rs", "gnome"]
36-
license = "MIT"
3734
name = "gdk-pixbuf-sys"
38-
repository = "https://github.com/gtk-rs/gtk-rs-core"
39-
version = "0.19.0"
40-
edition = "2021"
41-
rust-version = "1.70"
35+
36+
[package.authors]
37+
workspace = true
38+
39+
[package.edition]
40+
workspace = true
41+
42+
[package.exclude]
43+
workspace = true
44+
45+
[package.homepage]
46+
workspace = true
47+
48+
[package.license]
49+
workspace = true
50+
51+
[package.repository]
52+
workspace = true
53+
54+
[package.rust-version]
55+
workspace = true
56+
57+
[package.version]
58+
workspace = true
4259

4360
[package.metadata.system-deps.gdk_pixbuf_2_0]
4461
name = "gdk-pixbuf-2.0"

‎gio/Cargo.toml‎

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
11
[package]
22
name = "gio"
3-
license = "MIT"
4-
homepage = "https://gtk-rs.org/"
5-
authors = ["The gtk-rs Project Developers"]
63
keywords = ["glib", "gio", "gtk-rs", "gnome"]
74
readme = "README.md"
85
documentation = "https://gtk-rs.org/gtk-rs-core/stable/latest/docs/gio/"
9-
version = "0.19.0"
106
description = "Rust bindings for the Gio library"
11-
repository = "https://github.com/gtk-rs/gtk-rs-core"
12-
exclude = [
13-
"gir-files/*",
14-
]
15-
edition = "2021"
16-
rust-version = "1.70"
177
build = "build.rs"
8+
authors.workspace = true
9+
edition.workspace = true
10+
exclude.workspace = true
11+
homepage.workspace = true
12+
license.workspace = true
13+
repository.workspace = true
14+
rust-version.workspace = true
15+
version.workspace = true
1816

1917
[lib]
2018
name = "gio"
@@ -33,26 +31,21 @@ v2_76 = ["v2_74", "ffi/v2_76", "glib/v2_76"]
3331
v2_78 = ["v2_76", "ffi/v2_78", "glib/v2_78"]
3432
v2_80 = ["v2_78", "ffi/v2_80", "glib/v2_80"]
3533

36-
[package.metadata.docs.rs]
37-
all-features = true
38-
rustc-args = ["--cfg", "docsrs"]
39-
rustdoc-args = ["--cfg", "docsrs", "--generate-link-to-definition"]
40-
4134
[dependencies]
42-
libc = "0.2"
43-
once_cell = "1.19"
35+
libc.workspace = true
36+
once_cell.workspace = true
4437
futures-core = { version = "0.3", default-features = false }
4538
futures-channel = "0.3"
4639
futures-io = "0.3"
4740
futures-util = { version = "0.3", default-features = false }
4841
ffi = { package = "gio-sys", path = "sys" }
49-
glib = { path = "../glib" }
50-
thiserror = "1"
42+
glib.workspace = true
43+
thiserror.workspace = true
5144
pin-project-lite = "0.2"
5245
smallvec = "1"
5346

5447
[dev-dependencies]
5548
futures = "0.3"
5649
futures-util = { version = "0.3", features = ["io"] }
57-
gir-format-check = "^0.1"
50+
gir-format-check.workspace = true
5851
serial_test = "3"

‎gio/sys/Cargo.toml‎

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,34 @@ v2_80 = ["v2_78"]
3838
name = "gio_sys"
3939

4040
[package]
41-
authors = ["The gtk-rs Project Developers"]
4241
build = "build.rs"
4342
description = "FFI bindings to libgio-2.0"
44-
homepage = "https://gtk-rs.org/"
4543
keywords = ["gio", "ffi", "gtk-rs", "gnome"]
46-
license = "MIT"
4744
name = "gio-sys"
48-
repository = "https://github.com/gtk-rs/gtk-rs-core"
49-
version = "0.19.0"
50-
edition = "2021"
51-
rust-version = "1.70"
45+
46+
[package.authors]
47+
workspace = true
48+
49+
[package.edition]
50+
workspace = true
51+
52+
[package.exclude]
53+
workspace = true
54+
55+
[package.homepage]
56+
workspace = true
57+
58+
[package.license]
59+
workspace = true
60+
61+
[package.repository]
62+
workspace = true
63+
64+
[package.rust-version]
65+
workspace = true
66+
67+
[package.version]
68+
workspace = true
5269

5370
[package.metadata.system-deps.gio_2_0]
5471
name = "gio-2.0"

‎glib-build-tools/Cargo.toml‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
[package]
22
name = "glib-build-tools"
3-
license = "MIT"
4-
homepage = "https://gtk-rs.org/"
5-
authors = ["The gtk-rs Project Developers"]
63
keywords = ["glib", "gio", "gtk-rs", "gnome", "build-dependencies"]
74
readme = "README.md"
85
documentation = "https://gtk-rs.org/gtk-rs-core/stable/latest/docs/glib_build_tools"
9-
version = "0.19.0"
106
description = "Rust bindings for the Gio library, build script utils crate"
11-
repository = "https://github.com/gtk-rs/gtk-rs-core"
12-
edition = "2021"
13-
rust-version = "1.70"
7+
authors.workspace = true
8+
edition.workspace = true
9+
exclude.workspace = true
10+
homepage.workspace = true
11+
license.workspace = true
12+
repository.workspace = true
13+
rust-version.workspace = true
14+
version.workspace = true
1415

1516
[dependencies]
16-
gio = { path = "../gio", optional = true }
17+
gio.workspace = true

0 commit comments

Comments
 (0)