Skip to content

Commit

Permalink
Update monitord, indexmap & configparser + use new boolean in stat st…
Browse files Browse the repository at this point in the history
…ruct

Summary:
- Bring in latest monitord with a new metric we want for prod
- Hit an issue with latest cargo and 1.9.2 of indexmap so had to update it
- Just updated to 2.1 and it went away so lets also update fbcode so I can then update monitord

Edited monitord to use the new boolean in state and expose it via thrift call too
- Ensured bools do 0 and 1 as I hoped when casting to i64: https://play.rust-lang.org/?version=stable&mode=debug&edition=2021&gist=e70601f5f0c0a3a53eb301d88ee32bd7

Reviewed By: zertosh

Differential Revision: D52173287

fbshipit-source-id: e0cc0c8b905ed6712b21d6f040ad26e6971fd9ee
  • Loading branch information
cooperlees authored and facebook-github-bot committed Dec 15, 2023
1 parent da96a40 commit a31bdd0
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion vendor/ocaml/interop/ocamlrep/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ doctest = false
[dependencies]
bstr = { version = "1.4.0", features = ["serde", "std", "unicode"] }
bumpalo = { version = "3.14.0", features = ["allocator_api", "collections"] }
indexmap = { version = "1.9.2", features = ["arbitrary", "rayon", "serde-1"] }
indexmap = { version = "2.1.0", features = ["arbitrary", "rayon", "serde"] }
ocamlrep_derive = { path = "../ocamlrep_derive" }
rustc-hash = "1.1.0"
serde = { version = "1.0.185", features = ["derive", "rc"] }
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ attr_parser = { path = "../attr_parser" }
clap = { version = "3.2.25", features = ["derive", "env", "regex", "unicode", "wrap_help"] }
convert_case = "0.4.0"
derive_more = "0.99.17"
indexmap = { version = "1.9.2", features = ["arbitrary", "rayon", "serde-1"] }
indexmap = { version = "2.1.0", features = ["arbitrary", "rayon", "serde"] }
serde = { version = "1.0.185", features = ["derive", "rc"] }
signed_source = { path = "../../signed_source" }
syn = { version = "1.0.109", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] }
Expand Down
4 changes: 2 additions & 2 deletions vendor/ocaml/interop/rust_to_ocaml/rust_to_ocaml/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ pub struct Config {

#[derive(Debug, Default, Serialize, Deserialize)]
struct ModulesConfig {
#[serde(default, with = "indexmap::serde_seq")]
#[serde(default, with = "indexmap::map::serde_seq")]
rename: IndexMap<ModuleName, ModuleName>,
}

#[derive(Debug, Serialize, Deserialize)]
struct TypesConfig {
transparent: IndexSet<RustTypePath>,
#[serde(with = "indexmap::serde_seq")]
#[serde(with = "indexmap::map::serde_seq")]
rename: IndexMap<RustTypePath, OcamlTypePath>,
}

Expand Down
4 changes: 2 additions & 2 deletions vendor/ocaml/interop/rust_to_ocaml/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ pub struct Config {

#[derive(Debug, Default, Serialize, Deserialize)]
struct ModulesConfig {
#[serde(default, with = "indexmap::serde_seq")]
#[serde(default, with = "indexmap::map::serde_seq")]
rename: IndexMap<ModuleName, ModuleName>,
}

#[derive(Debug, Serialize, Deserialize)]
struct TypesConfig {
transparent: IndexSet<RustTypePath>,
#[serde(with = "indexmap::serde_seq")]
#[serde(with = "indexmap::map::serde_seq")]
rename: IndexMap<RustTypePath, OcamlTypePath>,
}

Expand Down
2 changes: 1 addition & 1 deletion vendor/ocaml/interop/shim/third-party/rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ clap-3 = { package = "clap", version = "3.2.25", features = ["derive", "env", "r
convert_case = "0.4.0"
derive_more = "0.99.17"
hex = "0.4.3"
indexmap = { version = "1.9.2", features = ["arbitrary", "rayon", "serde-1"] }
indexmap = { version = "2.1.0", features = ["arbitrary", "rayon", "serde"] }
md-5 = "0.10"
once_cell = "1.12"
proc-macro2 = { version = "1.0.70", features = ["span-locations"] }
Expand Down

0 comments on commit a31bdd0

Please sign in to comment.