Compare revisions

Sebastian Dröge · Sebastian Dröge · Sebastian Dröge · Sebastian Dröge · Sebastian Dröge · 9f04141a
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -419,8 +419,7 @@ outdated:
    - if: $CI_PIPELINE_SOURCE == "schedule"
  script:
    - cargo update --color=always
-    # Ignore derive_more until we can depend on Rust 1.75 or newer
-    - cargo outdated --color=always --root-deps-only --exit-code 1 -v --ignore derive_more
+    - cargo outdated --color=always --root-deps-only --exit-code 1 -v

 coverage:
  allow_failure: true

--- a/Cargo.lock
+++ b/Cargo.lock
@@ -50,9 +50,9 @@ checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04"

 [[package]]
 name = "anyhow"
-version = "1.0.89"
+version = "1.0.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
+checksum = "37bf3594c4c988a53154954629820791dde498571819ae4ca50ca811e060cc95"

 [[package]]
 name = "as-raw-xcb-connection"
@@ -150,9 +150,9 @@ checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c"

 [[package]]
 name = "bytemuck"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae"
+checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d"

 [[package]]
 name = "byteorder"
@@ -169,7 +169,7 @@ checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3"
 [[package]]
 name = "cairo-rs"
 version = "0.21.0"
-source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#d8dfa3a26184e7c6010744233fe5cc516310438e"
+source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#f27194b7aee1459103835c3cd42d2e288d7081f1"
 dependencies = [
 "bitflags 2.6.0",
 "cairo-sys-rs",
@@ -180,7 +180,7 @@ dependencies = [
 [[package]]
 name = "cairo-sys-rs"
 version = "0.21.0"
-source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#d8dfa3a26184e7c6010744233fe5cc516310438e"
+source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#f27194b7aee1459103835c3cd42d2e288d7081f1"
 dependencies = [
 "glib-sys",
 "libc",
@@ -215,9 +215,9 @@ dependencies = [

 [[package]]
 name = "cc"
-version = "1.1.24"
+version = "1.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "812acba72f0a070b003d3697490d2b55b837230ae7c6c6497f05cc2ddbb8d938"
+checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f"
 dependencies = [
 "jobserver",
 "libc",
@@ -316,12 +316,6 @@ dependencies = [
 "crossbeam-utils",
 ]

-[[package]]
-name = "convert_case"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
-
 [[package]]
 name = "core-foundation"
 version = "0.9.4"
@@ -425,15 +419,23 @@ checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"

 [[package]]
 name = "derive_more"
-version = "0.99.18"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05"
+dependencies = [
+ "derive_more-impl",
+]
+
+[[package]]
+name = "derive_more-impl"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce"
+checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22"
 dependencies = [
- "convert_case",
 "proc-macro2",
 "quote",
- "rustc_version",
 "syn",
+ "unicode-xid",
 ]

 [[package]]
@@ -601,9 +603,9 @@ checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"

 [[package]]
 name = "futures"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
 dependencies = [
 "futures-channel",
 "futures-core",
@@ -616,9 +618,9 @@ dependencies = [

 [[package]]
 name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
 "futures-core",
 "futures-sink",
@@ -626,15 +628,15 @@ dependencies = [

 [[package]]
 name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"

 [[package]]
 name = "futures-executor"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
 dependencies = [
 "futures-core",
 "futures-task",
@@ -643,15 +645,15 @@ dependencies = [

 [[package]]
 name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"

 [[package]]
 name = "futures-macro"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -660,21 +662,21 @@ dependencies = [

 [[package]]
 name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"

 [[package]]
 name = "futures-task"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"

 [[package]]
 name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
 "futures-channel",
 "futures-core",
@@ -712,7 +714,7 @@ dependencies = [
 [[package]]
 name = "gio"
 version = "0.21.0"
-source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#d8dfa3a26184e7c6010744233fe5cc516310438e"
+source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#f27194b7aee1459103835c3cd42d2e288d7081f1"
 dependencies = [
 "futures-channel",
 "futures-core",
@@ -728,7 +730,7 @@ dependencies = [
 [[package]]
 name = "gio-sys"
 version = "0.21.0"
-source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#d8dfa3a26184e7c6010744233fe5cc516310438e"
+source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#f27194b7aee1459103835c3cd42d2e288d7081f1"
 dependencies = [
 "glib-sys",
 "gobject-sys",
@@ -757,7 +759,7 @@ dependencies = [
 [[package]]
 name = "glib"
 version = "0.21.0"
-source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#d8dfa3a26184e7c6010744233fe5cc516310438e"
+source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#f27194b7aee1459103835c3cd42d2e288d7081f1"
 dependencies = [
 "bitflags 2.6.0",
 "futures-channel",
@@ -777,7 +779,7 @@ dependencies = [
 [[package]]
 name = "glib-macros"
 version = "0.21.0"
-source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#d8dfa3a26184e7c6010744233fe5cc516310438e"
+source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#f27194b7aee1459103835c3cd42d2e288d7081f1"
 dependencies = [
 "heck",
 "proc-macro-crate",
@@ -789,7 +791,7 @@ dependencies = [
 [[package]]
 name = "glib-sys"
 version = "0.21.0"
-source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#d8dfa3a26184e7c6010744233fe5cc516310438e"
+source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#f27194b7aee1459103835c3cd42d2e288d7081f1"
 dependencies = [
 "libc",
 "system-deps",
@@ -863,7 +865,7 @@ dependencies = [
 [[package]]
 name = "gobject-sys"
 version = "0.21.0"
-source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#d8dfa3a26184e7c6010744233fe5cc516310438e"
+source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#f27194b7aee1459103835c3cd42d2e288d7081f1"
 dependencies = [
 "glib-sys",
 "libc",
@@ -1696,9 +1698,9 @@ checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"

 [[package]]
 name = "js-sys"
-version = "0.3.70"
+version = "0.3.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
+checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
 dependencies = [
 "wasm-bindgen",
 ]
@@ -1711,9 +1713,9 @@ checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"

 [[package]]
 name = "libc"
-version = "0.2.159"
+version = "0.2.161"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
+checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"

 [[package]]
 name = "libloading"
@@ -1736,6 +1738,17 @@ dependencies = [
 "redox_syscall 0.4.1",
 ]

+[[package]]
+name = "libredox"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+dependencies = [
+ "bitflags 2.6.0",
+ "libc",
+ "redox_syscall 0.5.7",
+]
+
 [[package]]
 name = "linux-raw-sys"
 version = "0.4.14"
@@ -1916,12 +1929,9 @@ checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666"

 [[package]]
 name = "once_cell"
-version = "1.20.1"
+version = "1.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1"
-dependencies = [
- "portable-atomic",
-]
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"

 [[package]]
 name = "option-operations"
@@ -1934,17 +1944,17 @@ dependencies = [

 [[package]]
 name = "orbclient"
-version = "0.3.47"
+version = "0.3.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52f0d54bde9774d3a51dcf281a5def240c71996bc6ca05d2c847ec8b2b216166"
+checksum = "ba0b26cec2e24f08ed8bb31519a9333140a6599b867dac464bb150bdb796fd43"
 dependencies = [
- "libredox",
+ "libredox 0.1.3",
 ]

 [[package]]
 name = "pango"
 version = "0.21.0"
-source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#d8dfa3a26184e7c6010744233fe5cc516310438e"
+source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#f27194b7aee1459103835c3cd42d2e288d7081f1"
 dependencies = [
 "gio",
 "glib",
@@ -1955,7 +1965,7 @@ dependencies = [
 [[package]]
 name = "pango-sys"
 version = "0.21.0"
-source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#d8dfa3a26184e7c6010744233fe5cc516310438e"
+source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#f27194b7aee1459103835c3cd42d2e288d7081f1"
 dependencies = [
 "glib-sys",
 "gobject-sys",
@@ -1966,7 +1976,7 @@ dependencies = [
 [[package]]
 name = "pangocairo"
 version = "0.21.0"
-source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#d8dfa3a26184e7c6010744233fe5cc516310438e"
+source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#f27194b7aee1459103835c3cd42d2e288d7081f1"
 dependencies = [
 "cairo-rs",
 "glib",
@@ -1978,7 +1988,7 @@ dependencies = [
 [[package]]
 name = "pangocairo-sys"
 version = "0.21.0"
-source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#d8dfa3a26184e7c6010744233fe5cc516310438e"
+source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#f27194b7aee1459103835c3cd42d2e288d7081f1"
 dependencies = [
 "cairo-sys-rs",
 "glib-sys",
@@ -2051,12 +2061,6 @@ dependencies = [
 "windows-sys 0.59.0",
 ]

-[[package]]
-name = "portable-atomic"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
-
 [[package]]
 name = "proc-macro-crate"
 version = "3.2.0"
@@ -2068,9 +2072,9 @@ dependencies = [

 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9"
 dependencies = [
 "unicode-ident",
 ]
@@ -2117,6 +2121,15 @@ dependencies = [
 "bitflags 1.3.2",
 ]

+[[package]]
+name = "redox_syscall"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
+dependencies = [
+ "bitflags 2.6.0",
+]
+
 [[package]]
 name = "redox_termios"
 version = "0.1.3"
@@ -2135,15 +2148,6 @@ dependencies = [
 "serde_derive",
 ]

-[[package]]
-name = "rustc_version"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
-dependencies = [
- "semver",
-]
-
 [[package]]
 name = "rustix"
 version = "0.38.37"
@@ -2178,12 +2182,6 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"

-[[package]]
-name = "semver"
-version = "1.0.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
-
 [[package]]
 name = "serde"
 version = "1.0.210"
@@ -2215,9 +2213,9 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.128"
+version = "1.0.131"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
+checksum = "67d42a0bd4ac281beff598909bb56a86acaf979b84483e1c79c10dcaf98f8cf3"
 dependencies = [
 "itoa",
 "memchr",
@@ -2351,7 +2349,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "417813675a504dfbbf21bfde32c03e5bf9f2413999962b479023c02848c1c7a5"
 dependencies = [
 "libc",
- "libredox",
+ "libredox 0.0.2",
 "numtoa",
 "redox_termios",
 ]
@@ -2467,6 +2465,12 @@ version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"

+[[package]]
+name = "unicode-xid"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+
 [[package]]
 name = "version-compare"
 version = "0.2.0"
@@ -2497,9 +2501,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"

 [[package]]
 name = "wasm-bindgen"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
+checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
 dependencies = [
 "cfg-if",
 "once_cell",
@@ -2508,9 +2512,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
+checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
 dependencies = [
 "bumpalo",
 "log",
@@ -2523,9 +2527,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.43"
+version = "0.4.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
+checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b"
 dependencies = [
 "cfg-if",
 "js-sys",
@@ -2535,9 +2539,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
+checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
 dependencies = [
 "quote",
 "wasm-bindgen-macro-support",
@@ -2545,9 +2549,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
+checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -2558,9 +2562,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
+checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"

 [[package]]
 name = "wayland-backend"
@@ -2673,9 +2677,9 @@ dependencies = [

 [[package]]
 name = "web-sys"
-version = "0.3.70"
+version = "0.3.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
+checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112"
 dependencies = [
 "js-sys",
 "wasm-bindgen",

--- a/Cargo.toml
+++ b/Cargo.toml
@@ -112,7 +112,7 @@ categories = ["api-bindings", "multimedia"]
 repository = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs"
 homepage = "https://gstreamer.freedesktop.org"
 edition = "2021"
-rust-version = "1.71.1"
+rust-version = "1.80"

 [workspace.dependencies]
 gio = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "master" }

--- a/ci/images_template.yml
+++ b/ci/images_template.yml
@@ -2,7 +2,7 @@ variables:
  GST_RS_IMG_TAG: "2024-10-18.0"
  GST_RS_IMG_WINDOWS_TAG: "2024-10-18.0"
  GST_RS_STABLE: "1.82.0"
-  GST_RS_MSRV: "1.71.1"
+  GST_RS_MSRV: "1.80.1"
  # The branch we use to build GStreamer from in the docker images
  # Ex. main, 1.24, my-test-branch
  GST_UPSTREAM_BRANCH: 'main'
--- a/examples/Cargo.toml
+++ b/examples/Cargo.toml
@@ -28,7 +28,7 @@ gio = { workspace = true, optional = true }
 anyhow = "1.0"
 byte-slice-cast = "1"
 cairo-rs = { workspace = true, features=["use_glib"], optional = true }
-derive_more = "0.99.5"
+derive_more = { version = "1", features = ["display", "error"] }
 futures = "0.3"
 # Since there's nothing Windows-specific to enable on gstreamer-rs, unconditionally enable glutin's WGL backend
 glutin = { version = "0.31", optional = true, default-features = false, features = ["wgl"] }

--- a/examples/src/bin/appsink.rs
+++ b/examples/src/bin/appsink.rs
@@ -12,14 +12,14 @@

 use anyhow::Error;
 use byte_slice_cast::*;
-use derive_more::{Display, Error};
+use derive_more::derive::{Display, Error};
 use gst::{element_error, prelude::*};

 #[path = "../examples-common.rs"]
 mod examples_common;

 #[derive(Debug, Display, Error)]
-#[display(fmt = "Received error from {src}: {error} (debug: {debug:?})")]
+#[display("Received error from {src}: {error} (debug: {debug:?})")]
 struct ErrorMessage {
    src: glib::GString,
    error: glib::Error,

--- a/examples/src/bin/appsrc.rs
+++ b/examples/src/bin/appsrc.rs
@@ -11,7 +11,7 @@
 // Video / BGRx (4 bytes) / 2 fps

 use anyhow::Error;
-use derive_more::{Display, Error};
+use derive_more::derive::{Display, Error};
 use gst::prelude::*;
 use gst_video::prelude::*;

@@ -19,7 +19,7 @@ use gst_video::prelude::*;
 mod examples_common;

 #[derive(Debug, Display, Error)]
-#[display(fmt = "Received error from {src}: {error} (debug: {debug:?})")]
+#[display("Received error from {src}: {error} (debug: {debug:?})")]
 struct ErrorMessage {
    src: glib::GString,
    error: glib::Error,

--- a/examples/src/bin/decodebin.rs
+++ b/examples/src/bin/decodebin.rs
@@ -35,14 +35,14 @@ use std::{
 };

 use anyhow::Error;
-use derive_more::{Display, Error};
+use derive_more::derive::{Display, Error};
 use gst::{element_error, element_warning, prelude::*};

 #[path = "../examples-common.rs"]
 mod examples_common;

 #[derive(Debug, Display, Error)]
-#[display(fmt = "Received error from {src}: {error} (debug: {debug:?})")]
+#[display("Received error from {src}: {error} (debug: {debug:?})")]
 struct ErrorMessage {
    src: glib::GString,
    error: glib::Error,

--- a/examples/src/bin/discoverer.rs
+++ b/examples/src/bin/discoverer.rs
@@ -11,14 +11,14 @@
 use std::env;

 use anyhow::Error;
-use derive_more::{Display, Error};
+use derive_more::derive::{Display, Error};
 use gst_pbutils::{prelude::*, DiscovererInfo, DiscovererStreamInfo};

 #[path = "../examples-common.rs"]
 mod examples_common;

 #[derive(Debug, Display, Error)]
-#[display(fmt = "Discoverer error {_0}")]
+#[display("Discoverer error {_0}")]
 struct DiscovererError(#[error(not(source))] &'static str);

 fn print_tags(info: &DiscovererInfo) {

--- a/examples/src/bin/encodebin.rs
+++ b/examples/src/bin/encodebin.rs
@@ -18,7 +18,7 @@ use std::{
 };

 use anyhow::Error;
-use derive_more::{Display, Error};
+use derive_more::derive::{Display, Error};
 use gst::{element_error, element_warning};
 use gst_pbutils::prelude::*;

@@ -26,7 +26,7 @@ use gst_pbutils::prelude::*;
 mod examples_common;

 #[derive(Debug, Display, Error)]
-#[display(fmt = "Received error from {src}: {error} (debug: {debug:?})")]
+#[display("Received error from {src}: {error} (debug: {debug:?})")]
 struct ErrorMessage {
    src: glib::GString,
    error: glib::Error,

--- a/examples/src/bin/overlay-composition-d2d.rs
+++ b/examples/src/bin/overlay-composition-d2d.rs
@@ -10,7 +10,7 @@ use std::sync::{Arc, Mutex};
 use byte_slice_cast::*;

 use anyhow::Error;
-use derive_more::{Display, Error};
+use derive_more::derive::{Display, Error};
 use gst::prelude::*;
 use windows::{
    Foundation::Numerics::*,
@@ -26,7 +26,7 @@ use windows::{
 };

 #[derive(Debug, Display, Error)]
-#[display(fmt = "Received error from {}: {} (debug: {:?})", src, error, debug)]
+#[display("Received error from {}: {} (debug: {:?})", src, error, debug)]
 struct ErrorMessage {
    src: glib::GString,
    error: glib::Error,

--- a/examples/src/bin/overlay-composition.rs
+++ b/examples/src/bin/overlay-composition.rs
@@ -14,7 +14,7 @@ use std::{
 };

 use anyhow::Error;
-use derive_more::{Display, Error};
+use derive_more::derive::{Display, Error};
 use gst::prelude::*;
 use pango::prelude::*;

@@ -22,7 +22,7 @@ use pango::prelude::*;
 mod examples_common;

 #[derive(Debug, Display, Error)]
-#[display(fmt = "Received error from {src}: {error} (debug: {debug:?})")]
+#[display("Received error from {src}: {error} (debug: {debug:?})")]
 struct ErrorMessage {
    src: glib::GString,
    error: glib::Error,

--- a/examples/src/bin/pango-cairo.rs
+++ b/examples/src/bin/pango-cairo.rs
@@ -17,7 +17,7 @@ use std::{
 };

 use anyhow::Error;
-use derive_more::{Display, Error};
+use derive_more::derive::{Display, Error};
 use gst::prelude::*;
 use pango::prelude::*;

@@ -25,7 +25,7 @@ use pango::prelude::*;
 mod examples_common;

 #[derive(Debug, Display, Error)]
-#[display(fmt = "Received error from {src}: {error} (debug: {debug:?})")]
+#[display("Received error from {src}: {error} (debug: {debug:?})")]
 struct ErrorMessage {
    src: glib::GString,
    error: glib::Error,

--- a/examples/src/bin/rtpfecclient.rs
+++ b/examples/src/bin/rtpfecclient.rs
@@ -6,22 +6,22 @@ use gst::{element_error, prelude::*};
 mod examples_common;

 use anyhow::Error;
-use derive_more::{Display, Error};
+use derive_more::derive::{Display, Error};

 #[derive(Debug, Display, Error)]
-#[display(fmt = "No such pad {_0} in {_1}")]
+#[display("No such pad {_0} in {_1}")]
 struct NoSuchPad(#[error(not(source))] &'static str, String);

 #[derive(Debug, Display, Error)]
-#[display(fmt = "Unknown payload type {_0}")]
+#[display("Unknown payload type {_0}")]
 struct UnknownPT(#[error(not(source))] u32);

 #[derive(Debug, Display, Error)]
-#[display(fmt = "Usage: {_0} (play | record) DROP_PROBABILITY")]
+#[display("Usage: {_0} (play | record) DROP_PROBABILITY")]
 struct UsageError(#[error(not(source))] String);

 #[derive(Debug, Display, Error)]
-#[display(fmt = "Received error from {src}: {error} (debug: {debug:?})")]
+#[display("Received error from {src}: {error} (debug: {debug:?})")]
 struct ErrorMessage {
    src: glib::GString,
    error: glib::Error,

--- a/examples/src/bin/rtpfecserver.rs
+++ b/examples/src/bin/rtpfecserver.rs
@@ -6,18 +6,18 @@ mod examples_common;
 use std::env;

 use anyhow::Error;
-use derive_more::{Display, Error};
+use derive_more::derive::{Display, Error};

 #[derive(Debug, Display, Error)]
-#[display(fmt = "No such pad {_0} in {_1}")]
+#[display("No such pad {_0} in {_1}")]
 struct NoSuchPad(&'static str, String);

 #[derive(Debug, Display, Error)]
-#[display(fmt = "Usage: {_0} URI FEC_PERCENTAGE")]
+#[display("Usage: {_0} URI FEC_PERCENTAGE")]
 struct UsageError(#[error(not(source))] String);

 #[derive(Debug, Display, Error)]
-#[display(fmt = "Received error from {src}: {error} (debug: {debug:?})")]
+#[display("Received error from {src}: {error} (debug: {debug:?})")]
 struct ErrorMessage {
    src: glib::GString,
    error: glib::Error,

--- a/examples/src/bin/rtsp-server-custom-auth.rs
+++ b/examples/src/bin/rtsp-server-custom-auth.rs
@@ -5,14 +5,14 @@
 #![allow(clippy::non_send_fields_in_send_ty)]

 use anyhow::Error;
-use derive_more::{Display, Error};
+use derive_more::derive::{Display, Error};
 use gst_rtsp_server::prelude::*;

 #[path = "../examples-common.rs"]
 mod examples_common;

 #[derive(Debug, Display, Error)]
-#[display(fmt = "Could not get mount points")]
+#[display("Could not get mount points")]
 struct NoMountPoints;

 fn main_loop() -> Result<(), Error> {

--- a/examples/src/bin/rtsp-server-record.rs
+++ b/examples/src/bin/rtsp-server-record.rs
@@ -7,18 +7,18 @@
 use std::env;

 use anyhow::Error;
-use derive_more::{Display, Error};
+use derive_more::derive::{Display, Error};
 use gst_rtsp_server::prelude::*;

 #[path = "../examples-common.rs"]
 mod examples_common;

 #[derive(Debug, Display, Error)]
-#[display(fmt = "Could not get mount points")]
+#[display("Could not get mount points")]
 struct NoMountPoints;

 #[derive(Debug, Display, Error)]
-#[display(fmt = "Usage: {_0} LAUNCH_LINE")]
+#[display("Usage: {_0} LAUNCH_LINE")]
 struct UsageError(#[error(not(source))] String);

 fn main_loop() -> Result<(), Error> {

--- a/examples/src/bin/rtsp-server-subclass.rs
+++ b/examples/src/bin/rtsp-server-subclass.rs
@@ -9,14 +9,14 @@
 #![allow(clippy::non_send_fields_in_send_ty)]

 use anyhow::Error;
-use derive_more::{Display, Error};
+use derive_more::derive::{Display, Error};
 use gst_rtsp_server::prelude::*;

 #[path = "../examples-common.rs"]
 mod examples_common;

 #[derive(Debug, Display, Error)]
-#[display(fmt = "Could not get mount points")]
+#[display("Could not get mount points")]
 struct NoMountPoints;

 fn main_loop() -> Result<(), Error> {

--- a/examples/src/bin/rtsp-server.rs
+++ b/examples/src/bin/rtsp-server.rs
@@ -6,18 +6,18 @@
 use std::env;

 use anyhow::Error;
-use derive_more::{Display, Error};
+use derive_more::derive::{Display, Error};
 use gst_rtsp_server::prelude::*;

 #[path = "../examples-common.rs"]
 mod examples_common;

 #[derive(Debug, Display, Error)]
-#[display(fmt = "Could not get mount points")]
+#[display("Could not get mount points")]
 struct NoMountPoints;

 #[derive(Debug, Display, Error)]
-#[display(fmt = "Usage: {_0} LAUNCH_LINE")]
+#[display("Usage: {_0} LAUNCH_LINE")]
 struct UsageError(#[error(not(source))] String);

 fn main_loop() -> Result<(), Error> {

--- a/examples/src/bin/subclass.rs
+++ b/examples/src/bin/subclass.rs
@@ -8,7 +8,7 @@
 #![allow(clippy::non_send_fields_in_send_ty)]

 use anyhow::Error;
-use derive_more::{Display, Error};
+use derive_more::derive::{Display, Error};
 use gst::prelude::*;

 #[path = "../examples-common.rs"]
@@ -231,7 +231,7 @@ mod fir_filter {
 }

 #[derive(Debug, Display, Error)]
-#[display(fmt = "Received error from {src}: {error} (debug: {debug:?})")]
+#[display("Received error from {src}: {error} (debug: {debug:?})")]
 struct ErrorMessage {
    src: glib::GString,
    error: glib::Error,
No results found