diff --git a/rust/known_shas.bzl b/rust/known_shas.bzl index 47ed24be9a..452c153803 100644 --- a/rust/known_shas.bzl +++ b/rust/known_shas.bzl @@ -87,6 +87,9 @@ FILE_KEY_TO_SHA = { "rust-1.27.1-x86_64-apple-darwin": "475be237962d6aef1038a2faada26fda1e0eaea5d71d6950229a027a9c2bfe08", "rust-1.27.1-x86_64-unknown-freebsd": "739d38036c9f08c13bc7425cc5cccd3dd37860fa6e9dfc7bcd9081c8d3c5ccdd", "rust-1.27.1-x86_64-unknown-linux-gnu": "435778a837af764da2a7a7fb4d386b7b78516c7dfc732d892858e9a8a539989b", + "rust-1.27.2-x86_64-apple-darwin": "30c5cc58759caa4efdf2ea7d8438633139c98bee3408beb29ceb26985f3f5f70", + "rust-1.27.2-x86_64-unknown-freebsd": "b114c5eebc120b360d4d3c4360421ff181cc47bb311e161d3af6971b6d3e6244", + "rust-1.27.2-x86_64-unknown-linux-gnu": "5028a18e913ef3eb53e8d8119d2cc0594442725e055a9361012f8e26f754f2bf", "rustc-1.26.0-x86_64-apple-darwin": "5cb67314656d16cf2a1bdc84213aaaf6afdb5811825c7afba916e2d42d3d641f", "rustc-1.26.0-x86_64-unknown-freebsd": "9499ce5b68d631f8345c387e1f59b21892d97e0acb5650deb61a34719310bd38", "rustc-1.26.0-x86_64-unknown-linux-gnu": "7ca9a30010602aaf2244c376a3cc5baa89429d54da17b8ba1cb0cdfdc846cc61", @@ -102,6 +105,9 @@ FILE_KEY_TO_SHA = { "rustc-1.27.1-x86_64-apple-darwin": "747f616e07e5da9323a21c1cf9d76b53bb46094a68223d461a7333f26c714f19", "rustc-1.27.1-x86_64-unknown-freebsd": "9b199c21094f996fd9d4b620a5ff2c4bc5b8dab13e96bdf7c113291f601ec944", "rustc-1.27.1-x86_64-unknown-linux-gnu": "a6bf6205b345b854d705d0028a4e7161a0f5b209e464130e7d135fa01a296dc1", + "rustc-1.27.2-x86_64-apple-darwin": "b5c5edd2094afd0a92ad776dbd12cb6ee37800b940437dece10229ccacd1f561", + "rustc-1.27.2-x86_64-unknown-freebsd": "66d739632574fa52e82b40aca0eb4cef7a38047ed67cd6a240d8798a3cf9b6a6", + "rustc-1.27.2-x86_64-unknown-linux-gnu": "ec3efc17ddbe6625840957049e15ebae960f447c8e8feb7da40c28dd6adf655f", "rust-std-1.26.0-x86_64-apple-darwin": "cb5a0114e9e383aa93267868482db84f791124ee4faafdaed08ec6782d000fc2", "rust-std-1.26.0-x86_64-unknown-freebsd": "38cd138eba2ccaff59513d154fec580b6663ca6ef38cd620c348364aa1e11a40", "rust-std-1.26.0-x86_64-unknown-linux-gnu": "e27cb5c21541a500c8df919e15c8d3b002456ebbe573122e7b058cf5b4c3c13a", @@ -117,4 +123,7 @@ FILE_KEY_TO_SHA = { "rust-std-1.27.1-x86_64-apple-darwin": "a521599355e564984e43a63042b1de93dd7cf96730930501f86611dd766384e8", "rust-std-1.27.1-x86_64-unknown-freebsd": "12902b61a4897ade258217f045dfac3fe83d49dd52d1e2250bd94c3a10642b08", "rust-std-1.27.1-x86_64-unknown-linux-gnu": "9a1830b522117d68eeec703b50692093352212e035a46baceea666bb37739c2d", + "rust-std-1.27.2-x86_64-apple-darwin": "eed3688d9f551066593b34f07e4d28846caa99624c2168387993acc6bddd003d", + "rust-std-1.27.2-x86_64-unknown-freebsd": "6051f8bacbfbd2c3dceeddab8c66274bed7ef260cf346d367c53495cd1567572", + "rust-std-1.27.2-x86_64-unknown-linux-gnu": "68984f2233853d3e9c7c56edd72a91b5822157f28fdb42023fb311af68f842dd", } diff --git a/rust/repositories.bzl b/rust/repositories.bzl index 96b8d11ec4..f6fe682799 100644 --- a/rust/repositories.bzl +++ b/rust/repositories.bzl @@ -1,8 +1,36 @@ load(":known_shas.bzl", "FILE_KEY_TO_SHA") -load(":triple_mappings.bzl", "triple_to_system", "triple_to_constraint_set", "system_to_binary_ext", "system_to_dylib_ext", "system_to_staticlib_ext") +load(":triple_mappings.bzl", "system_to_binary_ext", "system_to_dylib_ext", "system_to_staticlib_ext", "triple_to_constraint_set", "triple_to_system") DEFAULT_TOOLCHAIN_NAME_PREFIX = "toolchain_for" +def rust_repositories(): + """Emits a default set of toolchains for Linux, OSX, and Freebsd + + Skip this macro and call the `rust_repository_set` macros directly if you need a compiler for + other hosts or for additional target triples. + """ + + rust_repository_set( + name = "rust_linux_x86_64", + exec_triple = "x86_64-unknown-linux-gnu", + extra_target_triples = [], + version = "1.27.2", + ) + + rust_repository_set( + name = "rust_darwin_x86_64", + exec_triple = "x86_64-apple-darwin", + extra_target_triples = [], + version = "1.27.2", + ) + + rust_repository_set( + name = "rust_freebsd_x86_64", + exec_triple = "x86_64-unknown-freebsd", + extra_target_triples = [], + version = "1.27.2", + ) + def _check_version_valid(version, iso_date, param_prefix = ""): """Verifies that the provided rust version and iso_date make sense.""" @@ -366,31 +394,3 @@ def rust_repository_set(name, version, exec_triple, extra_target_triples, iso_da # Register toolchains native.register_toolchains(*all_toolchain_names) - -def rust_repositories(): - """Emits a default set of toolchains for Linux, OSX, and Freebsd - - Skip this macro and call the `rust_repository_set` macros directly if you need a compiler for - other hosts or for additional target triples. - """ - - rust_repository_set( - name = "rust_linux_x86_64", - exec_triple = "x86_64-unknown-linux-gnu", - extra_target_triples = [], - version = "1.26.1", - ) - - rust_repository_set( - name = "rust_darwin_x86_64", - exec_triple = "x86_64-apple-darwin", - extra_target_triples = [], - version = "1.26.1", - ) - - rust_repository_set( - name = "rust_freebsd_x86_64", - exec_triple = "x86_64-unknown-freebsd", - extra_target_triples = [], - version = "1.26.1", - ) diff --git a/util/fetch_shas.sh b/util/fetch_shas.sh index b3b796c106..306bcd874b 100755 --- a/util/fetch_shas.sh +++ b/util/fetch_shas.sh @@ -46,6 +46,4 @@ emit_bzl_file_contents() { echo "}" } -#echo "$(enumerate_keys)[@]" - echo "$(emit_bzl_file_contents $(enumerate_keys))" > ./rust/known_shas.bzl diff --git a/util/fetch_shas_VERSIONS.txt b/util/fetch_shas_VERSIONS.txt index c3edc48a97..8605a17289 100644 --- a/util/fetch_shas_VERSIONS.txt +++ b/util/fetch_shas_VERSIONS.txt @@ -3,3 +3,4 @@ 1.26.2 1.27.0 1.27.1 +1.27.2