Fix conflict between doc(hidden) and doc(inline)

Summary: The Rust Thrift services crates are affected by a rustdoc bug which makes `doc(hidden)` ineffective when `doc(inline)` is used on a public re-export of a dependency. Working around this is important for {D58915758} so that the services crate for Thrift targets containing 0 services can be correctly identified as empty and excluded from rustdoc search. Reviewed By: diliop Differential Revision: D58915759 fbshipit-source-id: 6c43bcb59898d64a70b90bbc5c4e9bee6ef57d7a
facebook · Jun 23, 2024 · 0cbd38b · 0cbd38b
1 parent 0cec228
commit 0cbd38b
Show file tree

Hide file tree

Showing 19 changed files with 0 additions and 19 deletions.
diff --git a/thrift/compiler/generate/templates/rust/server.rs.mustache b/thrift/compiler/generate/templates/rust/server.rs.mustache
@@ -58,7 +58,6 @@ pub(crate) use {{program:types}}::services;
 #![allow(non_snake_case, unused_crate_dependencies)]
 {{/program:multifile?}}
 
-#[doc(inline)]
 pub use {{program:types}} as types;
 {{/program:services?}}
 {{#program:direct_dependencies?}}

diff --git a/thrift/compiler/test/fixtures/basic-enum/out/rust/gen-rust/server.rs b/thrift/compiler/test/fixtures/basic-enum/out/rust/gen-rust/server.rs
@@ -4,5 +4,4 @@
 #![doc(hidden)]
 #![allow(non_snake_case, unused_crate_dependencies)]
 
-#[doc(inline)]
 pub use :: as types;
diff --git a/thrift/compiler/test/fixtures/complex-union/out/rust/gen-rust/server.rs b/thrift/compiler/test/fixtures/complex-union/out/rust/gen-rust/server.rs
@@ -4,5 +4,4 @@
 #![doc(hidden)]
 #![allow(non_snake_case, unused_crate_dependencies)]
 
-#[doc(inline)]
 pub use :: as types;
diff --git a/thrift/compiler/test/fixtures/constants/out/rust/gen-rust/server.rs b/thrift/compiler/test/fixtures/constants/out/rust/gen-rust/server.rs
@@ -4,5 +4,4 @@
 #![doc(hidden)]
 #![allow(non_snake_case, unused_crate_dependencies)]
 
-#[doc(inline)]
 pub use :: as types;
diff --git a/thrift/compiler/test/fixtures/empty-struct/out/rust/gen-rust/server.rs b/thrift/compiler/test/fixtures/empty-struct/out/rust/gen-rust/server.rs
@@ -4,5 +4,4 @@
 #![doc(hidden)]
 #![allow(non_snake_case, unused_crate_dependencies)]
 
-#[doc(inline)]
 pub use :: as types;
diff --git a/thrift/compiler/test/fixtures/enums/out/rust/gen-rust/server.rs b/thrift/compiler/test/fixtures/enums/out/rust/gen-rust/server.rs
@@ -4,5 +4,4 @@
 #![doc(hidden)]
 #![allow(non_snake_case, unused_crate_dependencies)]
 
-#[doc(inline)]
 pub use :: as types;
diff --git a/thrift/compiler/test/fixtures/inject_metadata_fields/out/rust/gen-rust/server.rs b/thrift/compiler/test/fixtures/inject_metadata_fields/out/rust/gen-rust/server.rs
@@ -4,5 +4,4 @@
 #![doc(hidden)]
 #![allow(non_snake_case, unused_crate_dependencies)]
 
-#[doc(inline)]
 pub use :: as types;
diff --git a/thrift/compiler/test/fixtures/int_limits/out/rust/gen-rust/server.rs b/thrift/compiler/test/fixtures/int_limits/out/rust/gen-rust/server.rs
@@ -4,5 +4,4 @@
 #![doc(hidden)]
 #![allow(non_snake_case, unused_crate_dependencies)]
 
-#[doc(inline)]
 pub use :: as types;
diff --git a/thrift/compiler/test/fixtures/optionals/out/rust/gen-rust/server.rs b/thrift/compiler/test/fixtures/optionals/out/rust/gen-rust/server.rs
@@ -4,5 +4,4 @@
 #![doc(hidden)]
 #![allow(non_snake_case, unused_crate_dependencies)]
 
-#[doc(inline)]
 pub use :: as types;
diff --git a/thrift/compiler/test/fixtures/patch/out/rust/gen-rust/server.rs b/thrift/compiler/test/fixtures/patch/out/rust/gen-rust/server.rs
@@ -4,5 +4,4 @@
 #![doc(hidden)]
 #![allow(non_snake_case, unused_crate_dependencies)]
 
-#[doc(inline)]
 pub use :: as types;
diff --git a/thrift/compiler/test/fixtures/refs/out/rust/gen-rust/server.rs b/thrift/compiler/test/fixtures/refs/out/rust/gen-rust/server.rs
@@ -4,5 +4,4 @@
 #![doc(hidden)]
 #![allow(non_snake_case, unused_crate_dependencies)]
 
-#[doc(inline)]
 pub use :: as types;
diff --git a/thrift/compiler/test/fixtures/req-opt/out/rust/gen-rust/server.rs b/thrift/compiler/test/fixtures/req-opt/out/rust/gen-rust/server.rs
@@ -4,5 +4,4 @@
 #![doc(hidden)]
 #![allow(non_snake_case, unused_crate_dependencies)]
 
-#[doc(inline)]
 pub use :: as types;
diff --git a/thrift/compiler/test/fixtures/rust-default-enum-zero/out/rust/gen-rust/server.rs b/thrift/compiler/test/fixtures/rust-default-enum-zero/out/rust/gen-rust/server.rs
@@ -4,5 +4,4 @@
 #![doc(hidden)]
 #![allow(non_snake_case, unused_crate_dependencies)]
 
-#[doc(inline)]
 pub use :: as types;
diff --git a/thrift/compiler/test/fixtures/rust-extra-derives/out/rust/gen-rust/server.rs b/thrift/compiler/test/fixtures/rust-extra-derives/out/rust/gen-rust/server.rs
@@ -4,5 +4,4 @@
 #![doc(hidden)]
 #![allow(non_snake_case, unused_crate_dependencies)]
 
-#[doc(inline)]
 pub use :: as types;
diff --git a/thrift/compiler/test/fixtures/rust-include_src/out/rust/gen-rust/server.rs b/thrift/compiler/test/fixtures/rust-include_src/out/rust/gen-rust/server.rs
@@ -4,5 +4,4 @@
 #![doc(hidden)]
 #![allow(non_snake_case, unused_crate_dependencies)]
 
-#[doc(inline)]
 pub use :: as types;
diff --git a/thrift/compiler/test/fixtures/rust-newtype-typedef/out/rust/gen-rust/server.rs b/thrift/compiler/test/fixtures/rust-newtype-typedef/out/rust/gen-rust/server.rs
@@ -4,5 +4,4 @@
 #![doc(hidden)]
 #![allow(non_snake_case, unused_crate_dependencies)]
 
-#[doc(inline)]
 pub use :: as types;
diff --git a/thrift/compiler/test/fixtures/rust-no_serde-derive/out/rust/gen-rust/server.rs b/thrift/compiler/test/fixtures/rust-no_serde-derive/out/rust/gen-rust/server.rs
@@ -4,5 +4,4 @@
 #![doc(hidden)]
 #![allow(non_snake_case, unused_crate_dependencies)]
 
-#[doc(inline)]
 pub use :: as types;
diff --git a/thrift/compiler/test/fixtures/serialization_field_order/out/rust/gen-rust/server.rs b/thrift/compiler/test/fixtures/serialization_field_order/out/rust/gen-rust/server.rs
@@ -4,5 +4,4 @@
 #![doc(hidden)]
 #![allow(non_snake_case, unused_crate_dependencies)]
 
-#[doc(inline)]
 pub use :: as types;
diff --git a/thrift/compiler/test/fixtures/terse_write/out/rust/gen-rust/server.rs b/thrift/compiler/test/fixtures/terse_write/out/rust/gen-rust/server.rs
@@ -4,5 +4,4 @@
 #![doc(hidden)]
 #![allow(non_snake_case, unused_crate_dependencies)]
 
-#[doc(inline)]
 pub use :: as types;