Unify annotation targets (part 2)

Summary: Complete annotation target unification. It is a separate diff and not a part of D59332732 since `fbcode/thrift/annotation/BUCK` had to be removed before the rename needed to preserve version control history. Remove `compat` from `all` since it's pretty useless (mostly stubs that have no effect) and should probably be deprecated. Reviewed By: iahs Differential Revision: D60419596 fbshipit-source-id: 5721480111552b85218a6ad23aacafc20fb7885f
facebook · Jul 31, 2024 · 1ef12b3 · 1ef12b3
1 parent b8d5777
commit 1ef12b3
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 12 deletions.
diff --git a/thrift/lib/rust/annotation/all/Cargo.toml b/thrift/lib/rust/annotation/all/Cargo.toml
@@ -18,7 +18,6 @@ doc = false
 [dependencies]
 anyhow = "1.0.75"
 codegen_includer_proc_macro = { version = "0.1.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
-compat = { version = "0.0.1+unstable", path = "../compat" }
 cpp = { version = "0.0.1+unstable", path = "../cpp" }
 fbthrift = { version = "0.0.1+unstable", path = "../.." }
 futures = { version = "0.3.30", features = ["async-await", "compat"] }

diff --git a/thrift/lib/rust/annotation/all/clients/Cargo.toml b/thrift/lib/rust/annotation/all/clients/Cargo.toml
@@ -20,8 +20,6 @@ all__types = { package = "all", version = "0.0.1+unstable", path = ".." }
 anyhow = "1.0.75"
 async-trait = "0.1.71"
 codegen_includer_proc_macro = { version = "0.1.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
-compat = { version = "0.0.1+unstable", path = "../../compat" }
-compat_clients = { version = "0.0.1+unstable", path = "../../compat/clients" }
 cpp = { version = "0.0.1+unstable", path = "../../cpp" }
 cpp_clients = { version = "0.0.1+unstable", path = "../../cpp/clients" }
 fbthrift = { version = "0.0.1+unstable", path = "../../.." }

diff --git a/thrift/lib/rust/annotation/all/clients/thrift_build.rs b/thrift/lib/rust/annotation/all/clients/thrift_build.rs
@@ -6,7 +6,6 @@ use std::path::Path;
 use thrift_compiler::Config;
 use thrift_compiler::GenContext;
 const CRATEMAP: &str = "\
-thrift/annotation/compat.thrift compat //thrift/annotation:compat-rust
 thrift/annotation/cpp.thrift cpp //thrift/annotation:cpp-rust
 thrift/annotation/go.thrift go //thrift/annotation:go-rust
 thrift/annotation/hack.thrift hack //thrift/annotation:hack-rust

diff --git a/thrift/lib/rust/annotation/all/mocks/Cargo.toml b/thrift/lib/rust/annotation/all/mocks/Cargo.toml
@@ -21,9 +21,6 @@ all__types = { package = "all", version = "0.0.1+unstable", path = ".." }
 anyhow = "1.0.75"
 async-trait = "0.1.71"
 codegen_includer_proc_macro = { version = "0.1.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
-compat = { version = "0.0.1+unstable", path = "../../compat" }
-compat_clients = { version = "0.0.1+unstable", path = "../../compat/clients" }
-compat_mocks = { version = "0.0.1+unstable", path = "../../compat/mocks" }
 cpp = { version = "0.0.1+unstable", path = "../../cpp" }
 cpp_clients = { version = "0.0.1+unstable", path = "../../cpp/clients" }
 cpp_mocks = { version = "0.0.1+unstable", path = "../../cpp/mocks" }

diff --git a/thrift/lib/rust/annotation/all/mocks/thrift_build.rs b/thrift/lib/rust/annotation/all/mocks/thrift_build.rs
@@ -6,7 +6,6 @@ use std::path::Path;
 use thrift_compiler::Config;
 use thrift_compiler::GenContext;
 const CRATEMAP: &str = "\
-thrift/annotation/compat.thrift compat //thrift/annotation:compat-rust
 thrift/annotation/cpp.thrift cpp //thrift/annotation:cpp-rust
 thrift/annotation/go.thrift go //thrift/annotation:go-rust
 thrift/annotation/hack.thrift hack //thrift/annotation:hack-rust

diff --git a/thrift/lib/rust/annotation/all/services/Cargo.toml b/thrift/lib/rust/annotation/all/services/Cargo.toml
@@ -20,8 +20,6 @@ all__types = { package = "all", version = "0.0.1+unstable", path = ".." }
 anyhow = "1.0.75"
 async-trait = "0.1.71"
 codegen_includer_proc_macro = { version = "0.1.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
-compat = { version = "0.0.1+unstable", path = "../../compat" }
-compat_services = { version = "0.0.1+unstable", path = "../../compat/services" }
 cpp = { version = "0.0.1+unstable", path = "../../cpp" }
 cpp_services = { version = "0.0.1+unstable", path = "../../cpp/services" }
 fbthrift = { version = "0.0.1+unstable", path = "../../.." }

diff --git a/thrift/lib/rust/annotation/all/services/thrift_build.rs b/thrift/lib/rust/annotation/all/services/thrift_build.rs
@@ -6,7 +6,6 @@ use std::path::Path;
 use thrift_compiler::Config;
 use thrift_compiler::GenContext;
 const CRATEMAP: &str = "\
-thrift/annotation/compat.thrift compat //thrift/annotation:compat-rust
 thrift/annotation/cpp.thrift cpp //thrift/annotation:cpp-rust
 thrift/annotation/go.thrift go //thrift/annotation:go-rust
 thrift/annotation/hack.thrift hack //thrift/annotation:hack-rust

diff --git a/thrift/lib/rust/annotation/all/thrift_build.rs b/thrift/lib/rust/annotation/all/thrift_build.rs
@@ -6,7 +6,6 @@ use std::path::Path;
 use thrift_compiler::Config;
 use thrift_compiler::GenContext;
 const CRATEMAP: &str = "\
-thrift/annotation/compat.thrift compat //thrift/annotation:compat-rust
 thrift/annotation/cpp.thrift cpp //thrift/annotation:cpp-rust
 thrift/annotation/go.thrift go //thrift/annotation:go-rust
 thrift/annotation/hack.thrift hack //thrift/annotation:hack-rust