Delete fbthrift::types

Summary: This dates way back to the old Haskell-based compiler (D8961378). There is no reason for this in the "new" compiler. Reviewed By: zertosh Differential Revision: D53214333 fbshipit-source-id: c9f7bc95325b749b4103596bef9ccf8ad3ad17b1
facebook · Jan 30, 2024 · 4b1e282 · 4b1e282
1 parent aa201ff
commit 4b1e282
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 26 deletions.
diff --git a/thrift/compiler/generate/templates/rust/lib/errors.mustache b/thrift/compiler/generate/templates/rust/lib/errors.mustache
@@ -50,7 +50,7 @@ pub mod {{service:snake}} {
         {{#function:exceptions}}
         {{field:rust_name}}({{#field:type}}{{>lib/type}}{{/field:type}}),
         {{/function:exceptions}}
-        ApplicationException(::fbthrift::types::ApplicationException),
+        ApplicationException(::fbthrift::ApplicationException),
         ThriftError(::anyhow::Error),
     }
 
@@ -206,7 +206,7 @@ pub mod {{service:snake}} {
         {{#function:stream_exceptions}}
         {{field:rust_name}}({{#field:type}}{{>lib/type}}{{/field:type}}),
         {{/function:stream_exceptions}}
-        ApplicationException(::fbthrift::types::ApplicationException),
+        ApplicationException(::fbthrift::ApplicationException),
         ThriftError(::anyhow::Error),
     }
 

diff --git a/thrift/compiler/test/fixtures/basic-annotations/gen-rust/errors.rs b/thrift/compiler/test/fixtures/basic-annotations/gen-rust/errors.rs
diff --git a/thrift/compiler/test/fixtures/doctext/gen-rust/errors.rs b/thrift/compiler/test/fixtures/doctext/gen-rust/errors.rs
diff --git a/thrift/compiler/test/fixtures/exceptions/gen-rust/errors.rs b/thrift/compiler/test/fixtures/exceptions/gen-rust/errors.rs
diff --git a/thrift/compiler/test/fixtures/interactions/gen-rust/errors.rs b/thrift/compiler/test/fixtures/interactions/gen-rust/errors.rs
diff --git a/thrift/compiler/test/fixtures/rust-annotations/gen-rust/errors.rs b/thrift/compiler/test/fixtures/rust-annotations/gen-rust/errors.rs
diff --git a/thrift/compiler/test/fixtures/rust-request-context/gen-rust/errors.rs b/thrift/compiler/test/fixtures/rust-request-context/gen-rust/errors.rs
diff --git a/thrift/compiler/test/fixtures/stream/gen-rust/errors.rs b/thrift/compiler/test/fixtures/stream/gen-rust/errors.rs
diff --git a/thrift/lib/rust/src/lib.rs b/thrift/lib/rust/src/lib.rs
@@ -67,12 +67,6 @@ mod tests;
 #[doc(hidden)]
 pub mod help;
 
-pub mod types {
-    // Define ApplicationException as if it were a normal generated type to make things simpler
-    // for codegen.
-    pub use crate::application_exception::ApplicationException;
-}
-
 pub use crate::application_exception::ApplicationException;
 pub use crate::application_exception::ApplicationExceptionErrorCode;
 pub use crate::binary_protocol::BinaryProtocol;