diff --git a/dependencies/vaticle/repositories.bzl b/dependencies/vaticle/repositories.bzl index 2fbfd87f36..a634d6a9ad 100644 --- a/dependencies/vaticle/repositories.bzl +++ b/dependencies/vaticle/repositories.bzl @@ -25,7 +25,7 @@ def vaticle_dependencies(): git_repository( name = "vaticle_dependencies", remote = "https://github.com/vaticle/dependencies", - commit = "6843746768973d441be943b0f7c5c9b3ac7a88a9", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_dependencies + commit = "67a0602be830227247d31bb881029d752f05f9bb", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_dependencies ) def vaticle_typedb_common(): diff --git a/rust/BUILD b/rust/BUILD index e877213ac6..235a36652e 100644 --- a/rust/BUILD +++ b/rust/BUILD @@ -21,7 +21,7 @@ package(default_visibility = ["//visibility:public"]) -load("@rules_rust//rust:defs.bzl", "rust_library", "rust_static_library", "rustfmt_test", "rust_doc") +load("@rules_rust//rust:defs.bzl", "rust_library", "rust_static_library", "rustfmt_test") load("@vaticle_bazel_distribution//crates:rules.bzl", "assemble_crate", "deploy_crate") load("@vaticle_dependencies//builder/rust:rules.bzl", "rust_cbindgen") load("@vaticle_dependencies//builder/swig:java.bzl", "swig_java") diff --git a/rust/docs/connection/Database.adoc b/rust/docs/connection/Database.adoc index 5951c896a9..5c1355b651 100644 --- a/rust/docs/connection/Database.adoc +++ b/rust/docs/connection/Database.adoc @@ -136,7 +136,7 @@ database.primary_replica_info() [source,rust] ---- -pub fn replicas_info(&self) -> Vec ⓘ +pub fn replicas_info(&self) -> Vec ---- Returns the ``Replica`` instances for this database. _Only works in TypeDB Enterprise_ @@ -145,7 +145,7 @@ Returns the ``Replica`` instances for this database. _Only works in TypeDB Enter .Returns [source,rust] ---- -Vec ⓘ +Vec ---- [caption=""] diff --git a/tool/docs/rust/RustDocsParser.kt b/tool/docs/rust/RustDocsParser.kt index a1fde65a09..56e0fe55b8 100644 --- a/tool/docs/rust/RustDocsParser.kt +++ b/tool/docs/rust/RustDocsParser.kt @@ -28,6 +28,8 @@ import com.vaticle.typedb.driver.tool.docs.dataclasses.Variable import com.vaticle.typedb.driver.tool.docs.util.* import org.jsoup.Jsoup import org.jsoup.nodes.Element +import org.jsoup.nodes.Node +import org.jsoup.nodes.TextNode import picocli.CommandLine import picocli.CommandLine.Parameters import java.io.File @@ -205,7 +207,7 @@ class RustDocParser : Callable { } private fun parseMethod(element: Element, classAnchor: String, mode: String): Method { - val methodSignature = enhanceSignature(element.selectFirst("summary section h4")!!.html()) + val methodSignature = enhanceSignature(element.selectFirst("summary section h4")!!.wholeText()) val methodName = element.selectFirst("summary section h4 a.fn")!!.text() val methodAnchor = replaceSymbolsForAnchor( element.selectFirst("summary section h4 a.fn")!!.attr("href").substringAfter("#") @@ -279,7 +281,7 @@ class RustDocParser : Callable { } private fun enhanceSignature(signature: String): String { - return replaceHtmlSymbols(removeAllTags(replaceSpaces(dispatchNewlines(signature)))) + return signature; } private fun dispatchNewlines(html: String): String { diff --git a/tool/docs/rust/rules.bzl b/tool/docs/rust/rules.bzl index f5446ccc13..8df947bd03 100644 --- a/tool/docs/rust/rules.bzl +++ b/tool/docs/rust/rules.bzl @@ -24,19 +24,10 @@ load("@rules_rust//rust:defs.bzl", "rust_doc") def rust_docs(name, feature): - # rust_doc from rules_rust < 0.20 produces a zip-archive rust_doc( - name = "docs_html_zip_" + feature, - crate = ":typedb_driver", - # TODO: Replace with rustdoc_flags after upgrading rules_rust to >=0.20 - rustc_flags = ["--cfg", "feature=\"" + feature + "\""], - ) - - native.genrule( name = "docs_html_" + feature, - srcs = [":docs_html_zip_" + feature], - outs = ["docs_html_rustdoc_" + feature], - cmd = "mkdir $@ && unzip $< -d $@", + crate = ":typedb_driver", + rustdoc_flags = ["--cfg", "feature=\"" + feature + "\""], )