Skip to content

Commit

Permalink
Regenerate thrift_build.rs without base path canonicalization
Browse files Browse the repository at this point in the history 
Summary: Generated changes resulting from {D58388072}.

Reviewed By: zertosh

Differential Revision: D58388074

fbshipit-source-id: a0f8804f25bf35c4effb566c867aefc32396e4f6
  • Loading branch information
@facebook-github-bot
David Tolnay authored and facebook-github-bot committed Jun 11, 2024
1 parent 1b9233e commit 663f2f2
Show file tree
Hide file tree
Showing 156 changed files with 156 additions and 1,560 deletions.
11 changes: 1 addition & 10 deletions configerator/structs/scm/hg/hgclientconf/clients/thrift_build.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,7 @@ fn main() {
fs::write(cratemap_path, CRATEMAP).expect("Failed to write cratemap");
let mut conf = Config::from_env(GenContext::Clients)
.expect("Failed to instantiate thrift_compiler::Config");
let cargo_manifest_dir = env::var_os("CARGO_MANIFEST_DIR")
.expect("CARGO_MANIFEST_DIR not provided");
let mut base_path = Path::new(&cargo_manifest_dir)
.join("../../../../../..")
.canonicalize()
.expect("Failed to canonicalize base_path");
if cfg!(windows) {
base_path = base_path.to_string_lossy().trim_start_matches(r"\\?\").into();
}
conf.base_path(base_path);
conf.base_path("../../../../../..");
conf.types_crate("config__types");
conf.clients_crate("config__clients");
conf.options("serde");
Expand Down
11 changes: 1 addition & 10 deletions configerator/structs/scm/hg/hgclientconf/mocks/thrift_build.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,7 @@ fn main() {
fs::write(cratemap_path, CRATEMAP).expect("Failed to write cratemap");
let mut conf = Config::from_env(GenContext::Mocks)
.expect("Failed to instantiate thrift_compiler::Config");
let cargo_manifest_dir = env::var_os("CARGO_MANIFEST_DIR")
.expect("CARGO_MANIFEST_DIR not provided");
let mut base_path = Path::new(&cargo_manifest_dir)
.join("../../../../../..")
.canonicalize()
.expect("Failed to canonicalize base_path");
if cfg!(windows) {
base_path = base_path.to_string_lossy().trim_start_matches(r"\\?\").into();
}
conf.base_path(base_path);
conf.base_path("../../../../../..");
conf.types_crate("config__types");
conf.clients_crate("config__clients");
conf.options("serde");
Expand Down
11 changes: 1 addition & 10 deletions configerator/structs/scm/hg/hgclientconf/services/thrift_build.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,7 @@ fn main() {
fs::write(cratemap_path, CRATEMAP).expect("Failed to write cratemap");
let mut conf = Config::from_env(GenContext::Services)
.expect("Failed to instantiate thrift_compiler::Config");
let cargo_manifest_dir = env::var_os("CARGO_MANIFEST_DIR")
.expect("CARGO_MANIFEST_DIR not provided");
let mut base_path = Path::new(&cargo_manifest_dir)
.join("../../../../../..")
.canonicalize()
.expect("Failed to canonicalize base_path");
if cfg!(windows) {
base_path = base_path.to_string_lossy().trim_start_matches(r"\\?\").into();
}
conf.base_path(base_path);
conf.base_path("../../../../../..");
conf.types_crate("config__types");
conf.clients_crate("config__clients");
conf.options("serde");
Expand Down
11 changes: 1 addition & 10 deletions configerator/structs/scm/hg/hgclientconf/thrift_build.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,7 @@ fn main() {
fs::write(cratemap_path, CRATEMAP).expect("Failed to write cratemap");
let mut conf = Config::from_env(GenContext::Types)
.expect("Failed to instantiate thrift_compiler::Config");
let cargo_manifest_dir = env::var_os("CARGO_MANIFEST_DIR")
.expect("CARGO_MANIFEST_DIR not provided");
let mut base_path = Path::new(&cargo_manifest_dir)
.join("../../../../..")
.canonicalize()
.expect("Failed to canonicalize base_path");
if cfg!(windows) {
base_path = base_path.to_string_lossy().trim_start_matches(r"\\?\").into();
}
conf.base_path(base_path);
conf.base_path("../../../../..");
conf.types_crate("config__types");
conf.clients_crate("config__clients");
conf.options("serde");
Expand Down
11 changes: 1 addition & 10 deletions configerator/structs/scm/mononoke/lfs_server/clients/thrift_build.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,7 @@ fn main() {
fs::write(cratemap_path, CRATEMAP).expect("Failed to write cratemap");
let mut conf = Config::from_env(GenContext::Clients)
.expect("Failed to instantiate thrift_compiler::Config");
let cargo_manifest_dir = env::var_os("CARGO_MANIFEST_DIR")
.expect("CARGO_MANIFEST_DIR not provided");
let mut base_path = Path::new(&cargo_manifest_dir)
.join("../../../../../..")
.canonicalize()
.expect("Failed to canonicalize base_path");
if cfg!(windows) {
base_path = base_path.to_string_lossy().trim_start_matches(r"\\?\").into();
}
conf.base_path(base_path);
conf.base_path("../../../../../..");
conf.types_crate("lfs_server_config__types");
conf.clients_crate("lfs_server_config__clients");
conf.options("serde");
Expand Down
11 changes: 1 addition & 10 deletions configerator/structs/scm/mononoke/lfs_server/mocks/thrift_build.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,7 @@ fn main() {
fs::write(cratemap_path, CRATEMAP).expect("Failed to write cratemap");
let mut conf = Config::from_env(GenContext::Mocks)
.expect("Failed to instantiate thrift_compiler::Config");
let cargo_manifest_dir = env::var_os("CARGO_MANIFEST_DIR")
.expect("CARGO_MANIFEST_DIR not provided");
let mut base_path = Path::new(&cargo_manifest_dir)
.join("../../../../../..")
.canonicalize()
.expect("Failed to canonicalize base_path");
if cfg!(windows) {
base_path = base_path.to_string_lossy().trim_start_matches(r"\\?\").into();
}
conf.base_path(base_path);
conf.base_path("../../../../../..");
conf.types_crate("lfs_server_config__types");
conf.clients_crate("lfs_server_config__clients");
conf.options("serde");
Expand Down
11 changes: 1 addition & 10 deletions configerator/structs/scm/mononoke/lfs_server/services/thrift_build.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,7 @@ fn main() {
fs::write(cratemap_path, CRATEMAP).expect("Failed to write cratemap");
let mut conf = Config::from_env(GenContext::Services)
.expect("Failed to instantiate thrift_compiler::Config");
let cargo_manifest_dir = env::var_os("CARGO_MANIFEST_DIR")
.expect("CARGO_MANIFEST_DIR not provided");
let mut base_path = Path::new(&cargo_manifest_dir)
.join("../../../../../..")
.canonicalize()
.expect("Failed to canonicalize base_path");
if cfg!(windows) {
base_path = base_path.to_string_lossy().trim_start_matches(r"\\?\").into();
}
conf.base_path(base_path);
conf.base_path("../../../../../..");
conf.types_crate("lfs_server_config__types");
conf.clients_crate("lfs_server_config__clients");
conf.options("serde");
Expand Down
11 changes: 1 addition & 10 deletions configerator/structs/scm/mononoke/lfs_server/thrift_build.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,7 @@ fn main() {
fs::write(cratemap_path, CRATEMAP).expect("Failed to write cratemap");
let mut conf = Config::from_env(GenContext::Types)
.expect("Failed to instantiate thrift_compiler::Config");
let cargo_manifest_dir = env::var_os("CARGO_MANIFEST_DIR")
.expect("CARGO_MANIFEST_DIR not provided");
let mut base_path = Path::new(&cargo_manifest_dir)
.join("../../../../..")
.canonicalize()
.expect("Failed to canonicalize base_path");
if cfg!(windows) {
base_path = base_path.to_string_lossy().trim_start_matches(r"\\?\").into();
}
conf.base_path(base_path);
conf.base_path("../../../../..");
conf.types_crate("lfs_server_config__types");
conf.clients_crate("lfs_server_config__clients");
conf.options("serde");
Expand Down
11 changes: 1 addition & 10 deletions configerator/structs/scm/mononoke/megarepo/clients/thrift_build.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,7 @@ fn main() {
fs::write(cratemap_path, CRATEMAP).expect("Failed to write cratemap");
let mut conf = Config::from_env(GenContext::Clients)
.expect("Failed to instantiate thrift_compiler::Config");
let cargo_manifest_dir = env::var_os("CARGO_MANIFEST_DIR")
.expect("CARGO_MANIFEST_DIR not provided");
let mut base_path = Path::new(&cargo_manifest_dir)
.join("../../../../../..")
.canonicalize()
.expect("Failed to canonicalize base_path");
if cfg!(windows) {
base_path = base_path.to_string_lossy().trim_start_matches(r"\\?\").into();
}
conf.base_path(base_path);
conf.base_path("../../../../../..");
conf.types_crate("megarepo_configs__types");
conf.clients_crate("megarepo_configs__clients");
conf.options("serde");
Expand Down
11 changes: 1 addition & 10 deletions configerator/structs/scm/mononoke/megarepo/mocks/thrift_build.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,7 @@ fn main() {
fs::write(cratemap_path, CRATEMAP).expect("Failed to write cratemap");
let mut conf = Config::from_env(GenContext::Mocks)
.expect("Failed to instantiate thrift_compiler::Config");
let cargo_manifest_dir = env::var_os("CARGO_MANIFEST_DIR")
.expect("CARGO_MANIFEST_DIR not provided");
let mut base_path = Path::new(&cargo_manifest_dir)
.join("../../../../../..")
.canonicalize()
.expect("Failed to canonicalize base_path");
if cfg!(windows) {
base_path = base_path.to_string_lossy().trim_start_matches(r"\\?\").into();
}
conf.base_path(base_path);
conf.base_path("../../../../../..");
conf.types_crate("megarepo_configs__types");
conf.clients_crate("megarepo_configs__clients");
conf.options("serde");
Expand Down
11 changes: 1 addition & 10 deletions configerator/structs/scm/mononoke/megarepo/services/thrift_build.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,7 @@ fn main() {
fs::write(cratemap_path, CRATEMAP).expect("Failed to write cratemap");
let mut conf = Config::from_env(GenContext::Services)
.expect("Failed to instantiate thrift_compiler::Config");
let cargo_manifest_dir = env::var_os("CARGO_MANIFEST_DIR")
.expect("CARGO_MANIFEST_DIR not provided");
let mut base_path = Path::new(&cargo_manifest_dir)
.join("../../../../../..")
.canonicalize()
.expect("Failed to canonicalize base_path");
if cfg!(windows) {
base_path = base_path.to_string_lossy().trim_start_matches(r"\\?\").into();
}
conf.base_path(base_path);
conf.base_path("../../../../../..");
conf.types_crate("megarepo_configs__types");
conf.clients_crate("megarepo_configs__clients");
conf.options("serde");
Expand Down
11 changes: 1 addition & 10 deletions configerator/structs/scm/mononoke/megarepo/thrift_build.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,7 @@ fn main() {
fs::write(cratemap_path, CRATEMAP).expect("Failed to write cratemap");
let mut conf = Config::from_env(GenContext::Types)
.expect("Failed to instantiate thrift_compiler::Config");
let cargo_manifest_dir = env::var_os("CARGO_MANIFEST_DIR")
.expect("CARGO_MANIFEST_DIR not provided");
let mut base_path = Path::new(&cargo_manifest_dir)
.join("../../../../..")
.canonicalize()
.expect("Failed to canonicalize base_path");
if cfg!(windows) {
base_path = base_path.to_string_lossy().trim_start_matches(r"\\?\").into();
}
conf.base_path(base_path);
conf.base_path("../../../../..");
conf.types_crate("megarepo_configs__types");
conf.clients_crate("megarepo_configs__clients");
conf.options("serde");
Expand Down
11 changes: 1 addition & 10 deletions configerator/structs/scm/mononoke/megarepo/version_cconf_index/clients/thrift_build.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,7 @@ fn main() {
fs::write(cratemap_path, CRATEMAP).expect("Failed to write cratemap");
let mut conf = Config::from_env(GenContext::Clients)
.expect("Failed to instantiate thrift_compiler::Config");
let cargo_manifest_dir = env::var_os("CARGO_MANIFEST_DIR")
.expect("CARGO_MANIFEST_DIR not provided");
let mut base_path = Path::new(&cargo_manifest_dir)
.join("../../../../../../..")
.canonicalize()
.expect("Failed to canonicalize base_path");
if cfg!(windows) {
base_path = base_path.to_string_lossy().trim_start_matches(r"\\?\").into();
}
conf.base_path(base_path);
conf.base_path("../../../../../../..");
conf.types_crate("version_cconf_index__types");
conf.clients_crate("version_cconf_index__clients");
conf.options("serde");
Expand Down
11 changes: 1 addition & 10 deletions configerator/structs/scm/mononoke/megarepo/version_cconf_index/mocks/thrift_build.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,7 @@ fn main() {
fs::write(cratemap_path, CRATEMAP).expect("Failed to write cratemap");
let mut conf = Config::from_env(GenContext::Mocks)
.expect("Failed to instantiate thrift_compiler::Config");
let cargo_manifest_dir = env::var_os("CARGO_MANIFEST_DIR")
.expect("CARGO_MANIFEST_DIR not provided");
let mut base_path = Path::new(&cargo_manifest_dir)
.join("../../../../../../..")
.canonicalize()
.expect("Failed to canonicalize base_path");
if cfg!(windows) {
base_path = base_path.to_string_lossy().trim_start_matches(r"\\?\").into();
}
conf.base_path(base_path);
conf.base_path("../../../../../../..");
conf.types_crate("version_cconf_index__types");
conf.clients_crate("version_cconf_index__clients");
conf.options("serde");
Expand Down
11 changes: 1 addition & 10 deletions configerator/structs/scm/mononoke/megarepo/version_cconf_index/services/thrift_build.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,7 @@ fn main() {
fs::write(cratemap_path, CRATEMAP).expect("Failed to write cratemap");
let mut conf = Config::from_env(GenContext::Services)
.expect("Failed to instantiate thrift_compiler::Config");
let cargo_manifest_dir = env::var_os("CARGO_MANIFEST_DIR")
.expect("CARGO_MANIFEST_DIR not provided");
let mut base_path = Path::new(&cargo_manifest_dir)
.join("../../../../../../..")
.canonicalize()
.expect("Failed to canonicalize base_path");
if cfg!(windows) {
base_path = base_path.to_string_lossy().trim_start_matches(r"\\?\").into();
}
conf.base_path(base_path);
conf.base_path("../../../../../../..");
conf.types_crate("version_cconf_index__types");
conf.clients_crate("version_cconf_index__clients");
conf.options("serde");
Expand Down
11 changes: 1 addition & 10 deletions configerator/structs/scm/mononoke/megarepo/version_cconf_index/thrift_build.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,7 @@ fn main() {
fs::write(cratemap_path, CRATEMAP).expect("Failed to write cratemap");
let mut conf = Config::from_env(GenContext::Types)
.expect("Failed to instantiate thrift_compiler::Config");
let cargo_manifest_dir = env::var_os("CARGO_MANIFEST_DIR")
.expect("CARGO_MANIFEST_DIR not provided");
let mut base_path = Path::new(&cargo_manifest_dir)
.join("../../../../../..")
.canonicalize()
.expect("Failed to canonicalize base_path");
if cfg!(windows) {
base_path = base_path.to_string_lossy().trim_start_matches(r"\\?\").into();
}
conf.base_path(base_path);
conf.base_path("../../../../../..");
conf.types_crate("version_cconf_index__types");
conf.clients_crate("version_cconf_index__clients");
conf.options("serde");
Expand Down
11 changes: 1 addition & 10 deletions configerator/structs/scm/mononoke/mysql/replication_lag/clients/thrift_build.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,7 @@ fn main() {
fs::write(cratemap_path, CRATEMAP).expect("Failed to write cratemap");
let mut conf = Config::from_env(GenContext::Clients)
.expect("Failed to instantiate thrift_compiler::Config");
let cargo_manifest_dir = env::var_os("CARGO_MANIFEST_DIR")
.expect("CARGO_MANIFEST_DIR not provided");
let mut base_path = Path::new(&cargo_manifest_dir)
.join("../../../../../../..")
.canonicalize()
.expect("Failed to canonicalize base_path");
if cfg!(windows) {
base_path = base_path.to_string_lossy().trim_start_matches(r"\\?\").into();
}
conf.base_path(base_path);
conf.base_path("../../../../../../..");
conf.types_crate("replication_lag_config__types");
conf.clients_crate("replication_lag_config__clients");
conf.options("serde");
Expand Down
11 changes: 1 addition & 10 deletions configerator/structs/scm/mononoke/mysql/replication_lag/mocks/thrift_build.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,7 @@ fn main() {
fs::write(cratemap_path, CRATEMAP).expect("Failed to write cratemap");
let mut conf = Config::from_env(GenContext::Mocks)
.expect("Failed to instantiate thrift_compiler::Config");
let cargo_manifest_dir = env::var_os("CARGO_MANIFEST_DIR")
.expect("CARGO_MANIFEST_DIR not provided");
let mut base_path = Path::new(&cargo_manifest_dir)
.join("../../../../../../..")
.canonicalize()
.expect("Failed to canonicalize base_path");
if cfg!(windows) {
base_path = base_path.to_string_lossy().trim_start_matches(r"\\?\").into();
}
conf.base_path(base_path);
conf.base_path("../../../../../../..");
conf.types_crate("replication_lag_config__types");
conf.clients_crate("replication_lag_config__clients");
conf.options("serde");
Expand Down
11 changes: 1 addition & 10 deletions configerator/structs/scm/mononoke/mysql/replication_lag/services/thrift_build.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,7 @@ fn main() {
fs::write(cratemap_path, CRATEMAP).expect("Failed to write cratemap");
let mut conf = Config::from_env(GenContext::Services)
.expect("Failed to instantiate thrift_compiler::Config");
let cargo_manifest_dir = env::var_os("CARGO_MANIFEST_DIR")
.expect("CARGO_MANIFEST_DIR not provided");
let mut base_path = Path::new(&cargo_manifest_dir)
.join("../../../../../../..")
.canonicalize()
.expect("Failed to canonicalize base_path");
if cfg!(windows) {
base_path = base_path.to_string_lossy().trim_start_matches(r"\\?\").into();
}
conf.base_path(base_path);
conf.base_path("../../../../../../..");
conf.types_crate("replication_lag_config__types");
conf.clients_crate("replication_lag_config__clients");
conf.options("serde");
Expand Down
11 changes: 1 addition & 10 deletions configerator/structs/scm/mononoke/mysql/replication_lag/thrift_build.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,7 @@ fn main() {
fs::write(cratemap_path, CRATEMAP).expect("Failed to write cratemap");
let mut conf = Config::from_env(GenContext::Types)
.expect("Failed to instantiate thrift_compiler::Config");
let cargo_manifest_dir = env::var_os("CARGO_MANIFEST_DIR")
.expect("CARGO_MANIFEST_DIR not provided");
let mut base_path = Path::new(&cargo_manifest_dir)
.join("../../../../../..")
.canonicalize()
.expect("Failed to canonicalize base_path");
if cfg!(windows) {
base_path = base_path.to_string_lossy().trim_start_matches(r"\\?\").into();
}
conf.base_path(base_path);
conf.base_path("../../../../../..");
conf.types_crate("replication_lag_config__types");
conf.clients_crate("replication_lag_config__clients");
conf.options("serde");
Expand Down
11 changes: 1 addition & 10 deletions configerator/structs/scm/mononoke/observability/clients/thrift_build.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,7 @@ fn main() {
fs::write(cratemap_path, CRATEMAP).expect("Failed to write cratemap");
let mut conf = Config::from_env(GenContext::Clients)
.expect("Failed to instantiate thrift_compiler::Config");
let cargo_manifest_dir = env::var_os("CARGO_MANIFEST_DIR")
.expect("CARGO_MANIFEST_DIR not provided");
let mut base_path = Path::new(&cargo_manifest_dir)
.join("../../../../../..")
.canonicalize()
.expect("Failed to canonicalize base_path");
if cfg!(windows) {
base_path = base_path.to_string_lossy().trim_start_matches(r"\\?\").into();
}
conf.base_path(base_path);
conf.base_path("../../../../../..");
conf.types_crate("observability_config__types");
conf.clients_crate("observability_config__clients");
conf.options("deprecated_default_enum_min_i32,serde");
Expand Down
11 changes: 1 addition & 10 deletions configerator/structs/scm/mononoke/observability/mocks/thrift_build.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,7 @@ fn main() {
fs::write(cratemap_path, CRATEMAP).expect("Failed to write cratemap");
let mut conf = Config::from_env(GenContext::Mocks)
.expect("Failed to instantiate thrift_compiler::Config");
let cargo_manifest_dir = env::var_os("CARGO_MANIFEST_DIR")
.expect("CARGO_MANIFEST_DIR not provided");
let mut base_path = Path::new(&cargo_manifest_dir)
.join("../../../../../..")
.canonicalize()
.expect("Failed to canonicalize base_path");
if cfg!(windows) {
base_path = base_path.to_string_lossy().trim_start_matches(r"\\?\").into();
}
conf.base_path(base_path);
conf.base_path("../../../../../..");
conf.types_crate("observability_config__types");
conf.clients_crate("observability_config__clients");
conf.options("deprecated_default_enum_min_i32,serde");
Expand Down
Loading

0 comments on commit 663f2f2

Please sign in to comment.