0.21 backports

.github/workflows/CI.yml

@@ -116,6 +116,7 @@ jobs:
         run: cargo build --manifest-path glib-macros/Cargo.toml
       - name: "glib-macros: test"
         run: cargo test --manifest-path glib-macros/Cargo.toml
+        if: matrix.rust == 'stable'
       # glib-macros in 2 levels dependent
       - name: Check two levels glib dependent
         run: cargo check

.github/workflows/docs.yml

@@ -22,7 +22,6 @@ jobs:
         0.17=0.17
         0.16=0.16
         0.15=0.15
-      RUSTFLAGS: --cfg docsrs
       RUSTDOCFLAGS: --cfg docsrs -Zunstable-options --generate-link-to-definition
     steps:
       - uses: actions/checkout@v4

cairo/Cargo.toml

@@ -48,5 +48,4 @@ float_eq = "1"
 
 [package.metadata.docs.rs]
 all-features = true
-rustc-args = ["--cfg", "docsrs"]
-rustdoc-args = ["--cfg", "docsrs", "--generate-link-to-definition"]
+rustdoc-args = ["--generate-link-to-definition"]

cairo/README.md

@@ -40,10 +40,6 @@ Currently, the minimum supported Rust version is `1.83.0`.
 
  * **win32-surface** - Microsoft Windows surface support
 
-## Documentation rustdoc attributes
-
- * **docsrs** - Used to keep system dependent items in documentation
-
 ## Using
 
 We recommend using [crates from crates.io](https://crates.io/keywords/gtk-rs),

cairo/sys/Cargo.toml

@@ -71,5 +71,4 @@ system-deps = "7"
 
 [package.metadata.docs.rs]
 all-features = true
-rustc-args = ["--cfg", "docsrs"]
-rustdoc-args = ["--cfg", "docsrs", "--generate-link-to-definition"]
+rustdoc-args = ["--generate-link-to-definition"]

cairo/sys/build.rs

@@ -1,13 +1,11 @@
-#[cfg(not(docsrs))]
-use std::process;
-
-#[cfg(docsrs)]
-fn main() {} // prevent linking libraries to avoid documentation failure
-
-#[cfg(not(docsrs))]
 fn main() {
+    if std::env::var("DOCS_RS").is_ok() {
+        // prevent linking libraries to avoid documentation failure
+        return;
+    }
+
     if let Err(s) = system_deps::Config::new().probe() {
         println!("cargo:warning={s}");
-        process::exit(1);
+        std::process::exit(1);
     }
 }

gdk-pixbuf/Cargo.toml

@@ -32,5 +32,4 @@ gir-format-check.workspace = true
 
 [package.metadata.docs.rs]
 all-features = true
-rustc-args = ["--cfg", "docsrs"]
-rustdoc-args = ["--cfg", "docsrs", "--generate-link-to-definition"]
+rustdoc-args = ["--generate-link-to-definition"]

gdk-pixbuf/src/auto/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 697875997360)
+Generated by gir (https://github.com/gtk-rs/gir @ 3ddfba1db34e)
 from gir-files (https://github.com/gtk-rs/gir-files @ 1490bcc19dc8)

gdk-pixbuf/sys/Cargo.toml

@@ -69,6 +69,5 @@ version = "2.42"
 version = "2.43"
 
 [package.metadata.docs.rs]
-rustc-args = ["--cfg", "docsrs"]
-rustdoc-args = ["--cfg", "docsrs", "--generate-link-to-definition"]
+rustdoc-args = ["--generate-link-to-definition"]
 all-features = true

gdk-pixbuf/sys/build.rs

@@ -2,16 +2,14 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
-#[cfg(not(docsrs))]
-use std::process;
-
-#[cfg(docsrs)]
-fn main() {} // prevent linking libraries to avoid documentation failure
-
-#[cfg(not(docsrs))]
 fn main() {
+    if std::env::var("DOCS_RS").is_ok() {
+        // prevent linking libraries to avoid documentation failure
+        return;
+    }
+
     if let Err(s) = system_deps::Config::new().probe() {
         println!("cargo:warning={s}");
-        process::exit(1);
+        std::process::exit(1);
     }
 }

gdk-pixbuf/sys/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 697875997360)
+Generated by gir (https://github.com/gtk-rs/gir @ 3ddfba1db34e)
 from gir-files (https://github.com/gtk-rs/gir-files @ 1490bcc19dc8)

gio/Cargo.toml

@@ -4,7 +4,6 @@ keywords = ["glib", "gio", "gtk-rs", "gnome"]
 readme = "README.md"
 documentation = "https://gtk-rs.org/gtk-rs-core/stable/latest/docs/gio/"
 description = "Rust bindings for the Gio library"
-build = "build.rs"
 authors.workspace = true
 edition.workspace = true
 exclude.workspace = true
@@ -54,5 +53,4 @@ serial_test = "3"
 
 [package.metadata.docs.rs]
 all-features = true
-rustc-args = ["--cfg", "docsrs"]
-rustdoc-args = ["--cfg", "docsrs", "--generate-link-to-definition"]
+rustdoc-args = ["--generate-link-to-definition"]

gio/src/auto/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 697875997360)
+Generated by gir (https://github.com/gtk-rs/gir @ 3ddfba1db34e)
 from gir-files (https://github.com/gtk-rs/gir-files @ 1490bcc19dc8)