diff --git a/.changes/doc-fix.md b/.changes/doc-fix.md new file mode 100644 index 0000000..13657fc --- /dev/null +++ b/.changes/doc-fix.md @@ -0,0 +1,6 @@ +--- +"webkit2gtk-sys": patch +"webkit2gtk-rs": patch +--- + +Properly replaced dox with docrs. \ No newline at end of file diff --git a/Cargo.toml b/Cargo.toml index e851d8d..058665c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,6 @@ rustdoc-args = [ "--cfg", "docsrs" ] name = "webkit2gtk" [features] -dox = [ "ffi/dox", "java_script_core/dox" ] v2_2 = [ ] v2_4 = [ "v2_2" ] v2_6 = [ "v2_4", "ffi/v2_6" ] diff --git a/src/credential.rs b/src/credential.rs index 6f64bba..165f9c7 100644 --- a/src/credential.rs +++ b/src/credential.rs @@ -2,15 +2,15 @@ // from gir-files (https://github.com/vhdirk/gir-files.git) // DO NOT EDIT -#[cfg(any(feature = "v2_2", feature = "dox"))] -#[cfg_attr(feature = "dox", doc(cfg(feature = "v2_2")))] +#[cfg(any(feature = "v2_2", docsrs))] +#[cfg_attr(docsrs, doc(cfg(feature = "v2_2")))] use crate::CredentialPersistence; -#[cfg(any(feature = "v2_34", feature = "dox"))] -#[cfg_attr(feature = "dox", doc(cfg(feature = "v2_34")))] +#[cfg(any(feature = "v2_34", docsrs))] +#[cfg_attr(docsrs, doc(cfg(feature = "v2_34")))] use glib::object::IsA; use glib::translate::mut_override; -#[cfg(any(feature = "v2_2", feature = "dox"))] -#[cfg_attr(feature = "dox", doc(cfg(feature = "v2_2")))] +#[cfg(any(feature = "v2_2", docsrs))] +#[cfg_attr(docsrs, doc(cfg(feature = "v2_2")))] use glib::translate::*; glib::wrapper! { @@ -25,8 +25,8 @@ glib::wrapper! { } impl Credential { - #[cfg(any(feature = "v2_2", feature = "dox"))] - #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_2")))] + #[cfg(any(feature = "v2_2", docsrs))] + #[cfg_attr(docsrs, doc(cfg(feature = "v2_2")))] #[doc(alias = "webkit_credential_new")] pub fn new(username: &str, password: &str, persistence: CredentialPersistence) -> Credential { assert_initialized_main_thread!(); @@ -39,8 +39,8 @@ impl Credential { } } - #[cfg(any(feature = "v2_34", feature = "dox"))] - #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_34")))] + #[cfg(any(feature = "v2_34", docsrs))] + #[cfg_attr(docsrs, doc(cfg(feature = "v2_34")))] #[doc(alias = "webkit_credential_new_for_certificate")] #[doc(alias = "new_for_certificate")] pub fn for_certificate( @@ -56,8 +56,8 @@ impl Credential { } } - #[cfg(any(feature = "v2_34", feature = "dox"))] - #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_34")))] + #[cfg(any(feature = "v2_34", docsrs))] + #[cfg_attr(docsrs, doc(cfg(feature = "v2_34")))] #[doc(alias = "webkit_credential_new_for_certificate_pin")] #[doc(alias = "new_for_certificate_pin")] pub fn for_certificate_pin(pin: &str, persistence: CredentialPersistence) -> Credential { @@ -70,8 +70,8 @@ impl Credential { } } - #[cfg(any(feature = "v2_34", feature = "dox"))] - #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_34")))] + #[cfg(any(feature = "v2_34", docsrs))] + #[cfg_attr(docsrs, doc(cfg(feature = "v2_34")))] #[doc(alias = "webkit_credential_get_certificate")] #[doc(alias = "get_certificate")] pub fn certificate(&mut self) -> Option { @@ -82,8 +82,8 @@ impl Credential { } } - #[cfg(any(feature = "v2_2", feature = "dox"))] - #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_2")))] + #[cfg(any(feature = "v2_2", docsrs))] + #[cfg_attr(docsrs, doc(cfg(feature = "v2_2")))] #[doc(alias = "webkit_credential_get_password")] #[doc(alias = "get_password")] pub fn password(&mut self) -> Option { @@ -94,8 +94,8 @@ impl Credential { } } - #[cfg(any(feature = "v2_2", feature = "dox"))] - #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_2")))] + #[cfg(any(feature = "v2_2", docsrs))] + #[cfg_attr(docsrs, doc(cfg(feature = "v2_2")))] #[doc(alias = "webkit_credential_get_persistence")] #[doc(alias = "get_persistence")] pub fn persistence(&mut self) -> CredentialPersistence { @@ -106,8 +106,8 @@ impl Credential { } } - #[cfg(any(feature = "v2_2", feature = "dox"))] - #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_2")))] + #[cfg(any(feature = "v2_2", docsrs))] + #[cfg_attr(docsrs, doc(cfg(feature = "v2_2")))] #[doc(alias = "webkit_credential_get_username")] #[doc(alias = "get_username")] pub fn username(&mut self) -> Option { @@ -118,8 +118,8 @@ impl Credential { } } - #[cfg(any(feature = "v2_2", feature = "dox"))] - #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_2")))] + #[cfg(any(feature = "v2_2", docsrs))] + #[cfg_attr(docsrs, doc(cfg(feature = "v2_2")))] #[doc(alias = "webkit_credential_has_password")] pub fn has_password(&mut self) -> bool { unsafe { diff --git a/src/javascript_result.rs b/src/javascript_result.rs index 45134ec..b23b511 100644 --- a/src/javascript_result.rs +++ b/src/javascript_result.rs @@ -23,8 +23,8 @@ impl JavascriptResult { } } - #[cfg(any(feature = "v2_22", feature = "dox"))] - #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_22")))] + #[cfg(any(feature = "v2_22", docsrs))] + #[cfg_attr(docsrs, doc(cfg(feature = "v2_22")))] #[doc(alias = "webkit_javascript_result_get_js_value")] #[doc(alias = "get_js_value")] pub fn js_value(&self) -> Option { diff --git a/src/lib.rs b/src/lib.rs index 32c9eb7..34232a6 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,6 +1,6 @@ #![allow(deprecated)] #![doc = include_str!("../README.md")] -#![cfg_attr(feature = "dox", feature(doc_cfg))] +#![cfg_attr(docsrs, feature(doc_cfg))] pub use ffi; @@ -22,8 +22,8 @@ mod auto; // mod web_context; mod web_view; -#[cfg(any(feature = "v2_16", feature = "dox"))] -#[cfg_attr(feature = "dox", doc(cfg(feature = "v2_16")))] +#[cfg(any(feature = "v2_16", docsrs))] +#[cfg_attr(docsrs, doc(cfg(feature = "v2_16")))] mod website_data_manager; // pub use credential::*; @@ -31,8 +31,8 @@ mod website_data_manager; // pub use web_context::*; pub use web_view::*; -#[cfg(any(feature = "v2_16", feature = "dox"))] -#[cfg_attr(feature = "dox", doc(cfg(feature = "v2_16")))] +#[cfg(any(feature = "v2_16", docsrs))] +#[cfg_attr(docsrs, doc(cfg(feature = "v2_16")))] pub use website_data_manager::*; pub use crate::auto::builders::*; diff --git a/src/web_context.rs b/src/web_context.rs index 57120dc..4653844 100644 --- a/src/web_context.rs +++ b/src/web_context.rs @@ -9,8 +9,8 @@ use glib::IsA; use super::WebContext; pub trait WebContextExtManual { - #[cfg(any(feature = "v2_16", feature = "dox"))] - #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_16")))] + #[cfg(any(feature = "v2_16", docsrs))] + #[cfg_attr(docsrs, doc(cfg(feature = "v2_16")))] #[doc(alias = "webkit_web_context_set_network_proxy_settings")] fn set_network_proxy_settings( &self, @@ -23,8 +23,8 @@ impl WebContextExtManual for O where O: IsA, { - #[cfg(any(feature = "v2_16", feature = "dox"))] - #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_16")))] + #[cfg(any(feature = "v2_16", docsrs))] + #[cfg_attr(docsrs, doc(cfg(feature = "v2_16")))] fn set_network_proxy_settings( &self, proxy_mode: NetworkProxyMode, diff --git a/src/website_data_manager.rs b/src/website_data_manager.rs index eb0d9f7..e4ece41 100644 --- a/src/website_data_manager.rs +++ b/src/website_data_manager.rs @@ -1,19 +1,19 @@ -#[cfg(any(feature = "v2_16", feature = "dox"))] -#[cfg_attr(feature = "dox", doc(cfg(feature = "v2_16")))] +#[cfg(any(feature = "v2_16", docsrs))] +#[cfg_attr(docsrs, doc(cfg(feature = "v2_16")))] use crate::WebsiteData; use crate::WebsiteDataManager; -#[cfg(any(feature = "v2_16", feature = "dox"))] -#[cfg_attr(feature = "dox", doc(cfg(feature = "v2_16")))] +#[cfg(any(feature = "v2_16", docsrs))] +#[cfg_attr(docsrs, doc(cfg(feature = "v2_16")))] use crate::WebsiteDataTypes; use glib::{object::IsA, translate::*}; -#[cfg(any(feature = "v2_16", feature = "dox"))] -#[cfg_attr(feature = "dox", doc(cfg(feature = "v2_16")))] +#[cfg(any(feature = "v2_16", docsrs))] +#[cfg_attr(docsrs, doc(cfg(feature = "v2_16")))] use std::boxed::Box as Box_; use std::ptr; pub trait WebsiteDataManagerExtManual: 'static { - #[cfg(any(feature = "v2_16", feature = "dox"))] - #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_16")))] + #[cfg(any(feature = "v2_16", docsrs))] + #[cfg_attr(docsrs, doc(cfg(feature = "v2_16")))] #[doc(alias = "webkit_website_data_manager_clear")] fn clear) + Send + 'static>( &self, @@ -23,8 +23,8 @@ pub trait WebsiteDataManagerExtManual: 'static { callback: P, ); - #[cfg(any(feature = "v2_16", feature = "dox"))] - #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_16")))] + #[cfg(any(feature = "v2_16", docsrs))] + #[cfg_attr(docsrs, doc(cfg(feature = "v2_16")))] #[doc(alias = "webkit_website_data_manager_remove")] fn remove) + Send + 'static>( &self, @@ -36,8 +36,8 @@ pub trait WebsiteDataManagerExtManual: 'static { } impl> WebsiteDataManagerExtManual for O { - #[cfg(any(feature = "v2_16", feature = "dox"))] - #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_16")))] + #[cfg(any(feature = "v2_16", docsrs))] + #[cfg_attr(docsrs, doc(cfg(feature = "v2_16")))] fn clear) + Send + 'static>( &self, types: WebsiteDataTypes, @@ -75,8 +75,8 @@ impl> WebsiteDataManagerExtManual for O { } } - #[cfg(any(feature = "v2_16", feature = "dox"))] - #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_16")))] + #[cfg(any(feature = "v2_16", docsrs))] + #[cfg_attr(docsrs, doc(cfg(feature = "v2_16")))] fn remove) + Send + 'static>( &self, types: WebsiteDataTypes, diff --git a/sys/Cargo.toml b/sys/Cargo.toml index 14c9c41..f8b9a7c 100644 --- a/sys/Cargo.toml +++ b/sys/Cargo.toml @@ -1,9 +1,9 @@ [package] name = "webkit2gtk-sys" build = "build.rs" -categories = [ "api-bindings", "gui" ] +categories = ["api-bindings", "gui"] description = "Rust binding for webkit-gtk library" -keywords = [ "webkit", "gtk-rs", "gnome", "GUI" ] +keywords = ["webkit", "gtk-rs", "gnome", "GUI"] license = "MIT" links = "web_kit2" repository = "https://github.com/tauri-apps/webkit2gtk-rs" @@ -11,67 +11,67 @@ version = "2.0.0" edition = "2018" [package.metadata.docs.rs] -features = [ "dox" ] -rustc-args = [ "--cfg", "docsrs" ] -rustdoc-args = [ "--cfg", "docsrs", "--generate-link-to-definition" ] +rustc-args = ["--cfg", "docsrs"] +rustdoc-args = ["--cfg", "docsrs", "--generate-link-to-definition"] +all-features = true [package.metadata.system-deps.webkit2gtk_4_1] name = "webkit2gtk-4.1" version = "2.4" - [package.metadata.system-deps.webkit2gtk_4_1.v2_6] - version = "2.6" +[package.metadata.system-deps.webkit2gtk_4_1.v2_6] +version = "2.6" - [package.metadata.system-deps.webkit2gtk_4_1.v2_8] - version = "2.8" +[package.metadata.system-deps.webkit2gtk_4_1.v2_8] +version = "2.8" - [package.metadata.system-deps.webkit2gtk_4_1.v2_10] - version = "2.10" +[package.metadata.system-deps.webkit2gtk_4_1.v2_10] +version = "2.10" - [package.metadata.system-deps.webkit2gtk_4_1.v2_12] - version = "2.12" +[package.metadata.system-deps.webkit2gtk_4_1.v2_12] +version = "2.12" - [package.metadata.system-deps.webkit2gtk_4_1.v2_14] - version = "2.14" +[package.metadata.system-deps.webkit2gtk_4_1.v2_14] +version = "2.14" - [package.metadata.system-deps.webkit2gtk_4_1.v2_16] - version = "2.16" +[package.metadata.system-deps.webkit2gtk_4_1.v2_16] +version = "2.16" - [package.metadata.system-deps.webkit2gtk_4_1.v2_18] - version = "2.18" +[package.metadata.system-deps.webkit2gtk_4_1.v2_18] +version = "2.18" - [package.metadata.system-deps.webkit2gtk_4_1.v2_20] - version = "2.20" +[package.metadata.system-deps.webkit2gtk_4_1.v2_20] +version = "2.20" - [package.metadata.system-deps.webkit2gtk_4_1.v2_22] - version = "2.22" +[package.metadata.system-deps.webkit2gtk_4_1.v2_22] +version = "2.22" - [package.metadata.system-deps.webkit2gtk_4_1.v2_24] - version = "2.24" +[package.metadata.system-deps.webkit2gtk_4_1.v2_24] +version = "2.24" - [package.metadata.system-deps.webkit2gtk_4_1.v2_26] - version = "2.26" +[package.metadata.system-deps.webkit2gtk_4_1.v2_26] +version = "2.26" - [package.metadata.system-deps.webkit2gtk_4_1.v2_28] - version = "2.28" +[package.metadata.system-deps.webkit2gtk_4_1.v2_28] +version = "2.28" - [package.metadata.system-deps.webkit2gtk_4_1.v2_30] - version = "2.30" +[package.metadata.system-deps.webkit2gtk_4_1.v2_30] +version = "2.30" - [package.metadata.system-deps.webkit2gtk_4_1.v2_32] - version = "2.32" +[package.metadata.system-deps.webkit2gtk_4_1.v2_32] +version = "2.32" - [package.metadata.system-deps.webkit2gtk_4_1.v2_34] - version = "2.34" +[package.metadata.system-deps.webkit2gtk_4_1.v2_34] +version = "2.34" - [package.metadata.system-deps.webkit2gtk_4_1.v2_36] - version = "2.36" +[package.metadata.system-deps.webkit2gtk_4_1.v2_36] +version = "2.36" - [package.metadata.system-deps.webkit2gtk_4_1.v2_38] - version = "2.38" +[package.metadata.system-deps.webkit2gtk_4_1.v2_38] +version = "2.38" - [package.metadata.system-deps.webkit2gtk_4_1.v2_40] - version = "2.40" +[package.metadata.system-deps.webkit2gtk_4_1.v2_40] +version = "2.40" [lib] name = "webkit2gtk_sys" @@ -84,59 +84,58 @@ system-deps = "6" bitflags = "^1.0" libc = "0.2" - [dependencies.gtk] - package = "gtk-sys" - version = "0.18" +[dependencies.gtk] +package = "gtk-sys" +version = "0.18" - [dependencies.gdk] - package = "gdk-sys" - version = "0.18" +[dependencies.gdk] +package = "gdk-sys" +version = "0.18" - [dependencies.gio] - package = "gio-sys" - version = "0.18" +[dependencies.gio] +package = "gio-sys" +version = "0.18" - [dependencies.glib] - package = "glib-sys" - version = "0.18" +[dependencies.glib] +package = "glib-sys" +version = "0.18" - [dependencies.gobject] - package = "gobject-sys" - version = "0.18" +[dependencies.gobject] +package = "gobject-sys" +version = "0.18" - [dependencies.cairo] - package = "cairo-sys-rs" - version = "0.18" +[dependencies.cairo] +package = "cairo-sys-rs" +version = "0.18" - [dependencies.java_script_core] - package = "javascriptcore-rs-sys" - version = "=1.1" +[dependencies.java_script_core] +package = "javascriptcore-rs-sys" +version = "=1.1" - [dependencies.soup] - package = "soup3-sys" - version = "0.5" +[dependencies.soup] +package = "soup3-sys" +version = "0.5" [dev-dependencies] shell-words = "1.0.0" tempfile = "3" [features] -dox = [ "java_script_core/dox" ] -v2_6 = [ ] -v2_8 = [ "v2_6" ] -v2_10 = [ "v2_8" ] -v2_12 = [ "v2_10" ] -v2_14 = [ "v2_12" ] -v2_16 = [ "v2_14" ] -v2_18 = [ "v2_16" ] -v2_20 = [ "v2_18" ] -v2_22 = [ "v2_20" ] -v2_24 = [ "v2_22" ] -v2_26 = [ "v2_24" ] -v2_28 = [ "v2_26" ] -v2_30 = [ "v2_28" ] -v2_32 = [ "v2_30" ] -v2_34 = [ "v2_32" ] -v2_36 = [ "v2_34" ] -v2_38 = [ "v2_36" ] -v2_40 = [ "v2_38" ] +v2_6 = [] +v2_8 = ["v2_6"] +v2_10 = ["v2_8"] +v2_12 = ["v2_10"] +v2_14 = ["v2_12"] +v2_16 = ["v2_14"] +v2_18 = ["v2_16"] +v2_20 = ["v2_18"] +v2_22 = ["v2_20"] +v2_24 = ["v2_22"] +v2_26 = ["v2_24"] +v2_28 = ["v2_26"] +v2_30 = ["v2_28"] +v2_32 = ["v2_30"] +v2_34 = ["v2_32"] +v2_36 = ["v2_34"] +v2_38 = ["v2_36"] +v2_40 = ["v2_38"]