Skip to content

Commit 9b1f801

Browse files
David Tolnayfacebook-github-bot
David Tolnay
authored andcommitted
Update to Rust 1.42.0
Summary: This diff upgrades fbcode platform007 and platform009 to rust 1.42.0 + a cherry-pick of rust-lang/rust#69685 for AddressSanitizer support, and xplat to plain 1.42.0. Be aware that the xplat toolchain, for which we use the official upstream releases and don't build from source, no longer supports armv7-apple-ios and armv7s-apple-ios targets as of 1.42.0. Differential Revision: D20379253 fbshipit-source-id: c98fecc35dbe077f8dd1b8c7a7bab098795ac2dd
1 parent 013b847 commit 9b1f801

File tree

8 files changed

+8
-2
lines changed

8 files changed

+8
-2
lines changed

hphp/hack/src/hhbc/cargo/ast_constant_folder/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@ hhbc_string_utils_rust = { path = "../string_utils" }
1919
naming_special_names_rust = { path = "../../../naming" }
2020
oxidized = { path = "../../../oxidized" }
2121
runtime = { path = "../runtime" }
22+
indexmap = { version = "1.3", features = ["serde-1", "rayon"] }
2223
# @end of Signature

hphp/hack/src/hhbc/cargo/closure_convert/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ env = { path = "../env" }
1919
global_state = { path = "../global_state" }
2020
hhbc_id_rust = { path = "../hhbc_id" }
2121
hhbc_string_utils_rust = { path = "../string_utils" }
22+
instruction_sequence_rust = { path = "../instruction_sequence" }
2223
naming_special_names_rust = { path = "../../../naming" }
2324
ocamlrep = { path = "../../../ocamlrep" }
2425
options = { path = "../options" }

hphp/hack/src/hhbc/cargo/emit_expression/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ hhbc_string_utils_rust = { path = "../string_utils" }
2828
instruction_sequence_rust = { path = "../instruction_sequence" }
2929
label_rust = { path = "../label" }
3030
naming_special_names_rust = { path = "../../../naming" }
31+
ocaml_helper = { path = "../../../utils/ocaml_helper" }
3132
options = { path = "../options" }
3233
oxidized = { path = "../../../oxidized" }
3334
runtime = { path = "../runtime" }

hphp/hack/src/hhbc/cargo/emit_program/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ path = "../../emit_program.rs"
1212

1313
[dependencies]
1414
closure_convert_rust = { path = "../closure_convert" }
15+
emit_adata_rust = { path = "../emit_adata" }
1516
emit_body_rust = { path = "../emit_body" }
1617
emit_class_rust = { path = "../emit_class" }
1718
emit_constant_rust = { path = "../emit_constant" }

hphp/hack/src/hhbc/cargo/env/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,6 @@ options = { path = "../options" }
1818
oxidized = { path = "../../../oxidized" }
1919
rx_rust = { path = "../rx" }
2020
bitflags = "1.2"
21+
indexmap = { version = "1.3", features = ["serde-1", "rayon"] }
2122
lazy_static = "1.0"
2223
# @end of Signature

hphp/hack/src/hhbc/cargo/hhas_program/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ include = ["../../hhas_program.rs"]
1111
path = "../../hhas_program.rs"
1212

1313
[dependencies]
14+
hhas_adata_rust = { path = "../hhas_adata" }
1415
hhas_attribute_rust = { path = "../hhas_attribute" }
1516
hhas_body_rust = { path = "../hhas_body" }
1617
hhas_class_rust = { path = "../hhas_class" }

hphp/hack/src/typing/cargo/compile/typing_defs_rust/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
name = "typing_defs_rust"
66
edition = "2018"
77
version = "0.0.0"
8-
include = ["../../../internal_type_set.rs", "../../../typing_defs.rs", "../../../typing_defs_core.rs", "../../../typing_defs_rust.rs", "../../../typing_make_type.rs", "../../../typing_reason.rs"]
8+
include = ["../../../internal_type_set.rs", "../../../typing_defs.rs", "../../../typing_defs_core.rs", "../../../typing_defs_rust.rs", "../../../typing_logic.rs", "../../../typing_make_type.rs", "../../../typing_reason.rs"]
99

1010
[lib]
1111
path = "../../../typing_defs_rust.rs"

hphp/hack/src/typing/cargo/compile/typing_env_rust/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
name = "typing_env_rust"
66
edition = "2018"
77
version = "0.0.0"
8-
include = ["../../../typing_env.rs", "../../../typing_env_return_info.rs", "../../../typing_env_rust.rs", "../../../typing_env_types.rs", "../../../typing_inference_env.rs", "../../../typing_logic.rs", "../../../typing_tyvar_occurrences.rs"]
8+
include = ["../../../typing_env.rs", "../../../typing_env_return_info.rs", "../../../typing_env_rust.rs", "../../../typing_env_types.rs", "../../../typing_inference_env.rs", "../../../typing_tyvar_occurrences.rs"]
99

1010
[lib]
1111
path = "../../../typing_env_rust.rs"

0 commit comments

Comments
 (0)