Skip to content

cargo: move thrift codegen to a directory #1109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

cargo: move thrift codegen to a directory #1109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions eden/fs/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ members = [
"inodes/overlay/services",
"rust/edenfs-asserted-states",
"rust/redirect_ffi",
"service",
"service/clients",
"service/mocks",
"service/services",
"service/thrift",
"service/thrift/clients",
"service/thrift/mocks",
"service/thrift/services",
"service/thrift_streaming",
"service/thrift_streaming/clients",
"service/thrift_streaming/mocks",
Expand Down
1 change: 1 addition & 0 deletions eden/fs/service/BUCK
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,6 +483,7 @@ thrift_library(
"py-deprecated",
],
py_base_module = "facebook",
rust_autocargo = {"cargo_toml_dir": "thrift"},
rust_deps = [
"//common/rust/shed/sorted_vector_map:sorted_vector_map",
],
Expand Down
2 changes: 1 addition & 1 deletion eden/fs/service/Cargo.toml → eden/fs/service/thrift/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ doc = false
[dependencies]
anyhow = "1.0.98"
codegen_includer_proc_macro = { version = "0.1.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
config_thrift = { version = "0.1.0", path = "../config" }
config_thrift = { version = "0.1.0", path = "../../config" }
cpp = { version = "0.0.1+unstable", git = "https://github.com/facebook/fbthrift.git", branch = "main" }
fb303_core = { version = "0.0.0", git = "https://github.com/facebook/fb303.git", branch = "main" }
fbthrift = { version = "0.0.1+unstable", git = "https://github.com/facebook/fbthrift.git", branch = "main" }
Expand Down
4 changes: 2 additions & 2 deletions eden/fs/service/clients/Cargo.toml → eden/fs/service/thrift/clients/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ doc = false
anyhow = "1.0.98"
async-trait = "0.1.86"
codegen_includer_proc_macro = { version = "0.1.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
config_thrift = { version = "0.1.0", path = "../../config" }
config_thrift_clients = { version = "0.1.0", path = "../../config/clients" }
config_thrift = { version = "0.1.0", path = "../../../config" }
config_thrift_clients = { version = "0.1.0", path = "../../../config/clients" }
cpp = { version = "0.0.1+unstable", git = "https://github.com/facebook/fbthrift.git", branch = "main" }
cpp_clients = { version = "0.0.1+unstable", git = "https://github.com/facebook/fbthrift.git", branch = "main" }
fb303_core = { version = "0.0.0", git = "https://github.com/facebook/fb303.git", branch = "main" }
Expand Down
4 changes: 2 additions & 2 deletions eden/fs/service/clients/thrift_build.rs → ...fs/service/thrift/clients/thrift_build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ fn main() {
fs::write(cratemap_path, CRATEMAP).expect("Failed to write cratemap");
Config::from_env(GenContext::Clients)
.expect("Failed to instantiate thrift_compiler::Config")
.base_path("../../../..")
.base_path("../../../../..")
.types_crate("thrift__types")
.clients_crate("thrift__clients")
.options("deprecated_default_enum_min_i32")
.run(["../eden.thrift"])
.run(["../../eden.thrift"])
.expect("Failed while running thrift compilation");
}
0 eden/fs/service/clients/thrift_lib.rs → eden/fs/service/thrift/clients/thrift_lib.rs
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions eden/fs/service/mocks/Cargo.toml → eden/fs/service/thrift/mocks/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ doc = false
anyhow = "1.0.98"
async-trait = "0.1.86"
codegen_includer_proc_macro = { version = "0.1.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
config_thrift = { version = "0.1.0", path = "../../config" }
config_thrift_clients = { version = "0.1.0", path = "../../config/clients" }
config_thrift_mocks = { version = "0.1.0", path = "../../config/mocks" }
config_thrift = { version = "0.1.0", path = "../../../config" }
config_thrift_clients = { version = "0.1.0", path = "../../../config/clients" }
config_thrift_mocks = { version = "0.1.0", path = "../../../config/mocks" }
cpp = { version = "0.0.1+unstable", git = "https://github.com/facebook/fbthrift.git", branch = "main" }
cpp_clients = { version = "0.0.1+unstable", git = "https://github.com/facebook/fbthrift.git", branch = "main" }
cpp_mocks = { version = "0.0.1+unstable", git = "https://github.com/facebook/fbthrift.git", branch = "main" }
Expand Down
6 changes: 3 additions & 3 deletions eden/fs/service/thrift_build.rs → eden/fs/service/thrift/mocks/thrift_build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ fn main() {
let out_dir = env::var_os("OUT_DIR").expect("OUT_DIR env not provided");
let cratemap_path = Path::new(&out_dir).join("cratemap");
fs::write(cratemap_path, CRATEMAP).expect("Failed to write cratemap");
Config::from_env(GenContext::Types)
Config::from_env(GenContext::Mocks)
.expect("Failed to instantiate thrift_compiler::Config")
.base_path("../../..")
.base_path("../../../../..")
.types_crate("thrift__types")
.clients_crate("thrift__clients")
.options("deprecated_default_enum_min_i32")
.run(["eden.thrift"])
.run(["../../eden.thrift"])
.expect("Failed while running thrift compilation");
}
0 eden/fs/service/mocks/thrift_lib.rs → eden/fs/service/thrift/mocks/thrift_lib.rs
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions eden/fs/service/services/Cargo.toml → eden/fs/service/thrift/services/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ doc = false
anyhow = "1.0.98"
async-trait = "0.1.86"
codegen_includer_proc_macro = { version = "0.1.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
config_thrift = { version = "0.1.0", path = "../../config" }
config_thrift_services = { version = "0.1.0", path = "../../config/services" }
config_thrift = { version = "0.1.0", path = "../../../config" }
config_thrift_services = { version = "0.1.0", path = "../../../config/services" }
cpp = { version = "0.0.1+unstable", git = "https://github.com/facebook/fbthrift.git", branch = "main" }
cpp_services = { version = "0.0.1+unstable", git = "https://github.com/facebook/fbthrift.git", branch = "main" }
fb303_core = { version = "0.0.0", git = "https://github.com/facebook/fb303.git", branch = "main" }
Expand Down
4 changes: 2 additions & 2 deletions eden/fs/service/services/thrift_build.rs → ...s/service/thrift/services/thrift_build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ fn main() {
fs::write(cratemap_path, CRATEMAP).expect("Failed to write cratemap");
Config::from_env(GenContext::Services)
.expect("Failed to instantiate thrift_compiler::Config")
.base_path("../../../..")
.base_path("../../../../..")
.types_crate("thrift__types")
.clients_crate("thrift__clients")
.options("deprecated_default_enum_min_i32")
.run(["../eden.thrift"])
.run(["../../eden.thrift"])
.expect("Failed while running thrift compilation");
}
0 eden/fs/service/services/thrift_lib.rs → .../fs/service/thrift/services/thrift_lib.rs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion eden/fs/service/mocks/thrift_build.rs → eden/fs/service/thrift/thrift_build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ fn main() {
let out_dir = env::var_os("OUT_DIR").expect("OUT_DIR env not provided");
let cratemap_path = Path::new(&out_dir).join("cratemap");
fs::write(cratemap_path, CRATEMAP).expect("Failed to write cratemap");
Config::from_env(GenContext::Mocks)
Config::from_env(GenContext::Types)
.expect("Failed to instantiate thrift_compiler::Config")
.base_path("../../../..")
.types_crate("thrift__types")
Expand Down
0 eden/fs/service/thrift_lib.rs → eden/fs/service/thrift/thrift_lib.rs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion eden/fs/service/thrift_streaming/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ fbthrift = { version = "0.0.1+unstable", git = "https://github.com/facebook/fbth
futures = { version = "0.3.31", features = ["async-await", "compat"] }
ref-cast = "1.0.18"
thiserror = "2.0.12"
thrift__0 = { package = "thrift", version = "0.1.0", path = ".." }
thrift__0 = { package = "thrift", version = "0.1.0", path = "../thrift" }
thrift__1 = { package = "thrift", version = "0.0.1+unstable", git = "https://github.com/facebook/fbthrift.git", branch = "main" }

[build-dependencies]
Expand Down
4 changes: 2 additions & 2 deletions eden/fs/service/thrift_streaming/clients/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ async-trait = "0.1.86"
codegen_includer_proc_macro = { version = "0.1.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
fbthrift = { version = "0.0.1+unstable", git = "https://github.com/facebook/fbthrift.git", branch = "main" }
futures = { version = "0.3.31", features = ["async-await", "compat"] }
thrift__0 = { package = "thrift", version = "0.1.0", path = "../.." }
thrift__0_clients = { package = "thrift_clients", version = "0.1.0", path = "../../clients" }
thrift__0 = { package = "thrift", version = "0.1.0", path = "../../thrift" }
thrift__0_clients = { package = "thrift_clients", version = "0.1.0", path = "../../thrift/clients" }
thrift__1 = { package = "thrift", version = "0.0.1+unstable", git = "https://github.com/facebook/fbthrift.git", branch = "main" }
thrift__1_clients = { package = "thrift_clients", version = "0.0.1+unstable", git = "https://github.com/facebook/fbthrift.git", branch = "main" }
thrift_streaming__types = { package = "thrift_streaming", version = "0.1.0", path = ".." }
Expand Down
6 changes: 3 additions & 3 deletions eden/fs/service/thrift_streaming/mocks/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ async-trait = "0.1.86"
codegen_includer_proc_macro = { version = "0.1.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
fbthrift = { version = "0.0.1+unstable", git = "https://github.com/facebook/fbthrift.git", branch = "main" }
futures = { version = "0.3.31", features = ["async-await", "compat"] }
thrift__0 = { package = "thrift", version = "0.1.0", path = "../.." }
thrift__0_clients = { package = "thrift_clients", version = "0.1.0", path = "../../clients" }
thrift__0_mocks = { package = "thrift_mocks", version = "0.1.0", path = "../../mocks" }
thrift__0 = { package = "thrift", version = "0.1.0", path = "../../thrift" }
thrift__0_clients = { package = "thrift_clients", version = "0.1.0", path = "../../thrift/clients" }
thrift__0_mocks = { package = "thrift_mocks", version = "0.1.0", path = "../../thrift/mocks" }
thrift__1 = { package = "thrift", version = "0.0.1+unstable", git = "https://github.com/facebook/fbthrift.git", branch = "main" }
thrift__1_clients = { package = "thrift_clients", version = "0.0.1+unstable", git = "https://github.com/facebook/fbthrift.git", branch = "main" }
thrift__1_mocks = { package = "thrift_mocks", version = "0.0.1+unstable", git = "https://github.com/facebook/fbthrift.git", branch = "main" }
Expand Down
4 changes: 2 additions & 2 deletions eden/fs/service/thrift_streaming/services/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ async-trait = "0.1.86"
codegen_includer_proc_macro = { version = "0.1.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
fbthrift = { version = "0.0.1+unstable", git = "https://github.com/facebook/fbthrift.git", branch = "main" }
futures = { version = "0.3.31", features = ["async-await", "compat"] }
thrift__0 = { package = "thrift", version = "0.1.0", path = "../.." }
thrift__0_services = { package = "thrift_services", version = "0.1.0", path = "../../services" }
thrift__0 = { package = "thrift", version = "0.1.0", path = "../../thrift" }
thrift__0_services = { package = "thrift_services", version = "0.1.0", path = "../../thrift/services" }
thrift__1 = { package = "thrift", version = "0.0.1+unstable", git = "https://github.com/facebook/fbthrift.git", branch = "main" }
thrift__1_services = { package = "thrift_services", version = "0.0.1+unstable", git = "https://github.com/facebook/fbthrift.git", branch = "main" }
thrift_streaming__types = { package = "thrift_streaming", version = "0.1.0", path = ".." }
Expand Down