| Tim Windelschmidt | d481749 | 2025-06-16 15:03:12 +0200 | [diff] [blame] | 1 | From 865b50b442368ba2a91a53d68b946e04022875e4 Mon Sep 17 00:00:00 2001 |
| Tim Windelschmidt | 1f51cf4 | 2024-10-01 17:04:28 +0200 | [diff] [blame] | 2 | From: Lorenz Brun <lorenz@monogon.tech> |
| 3 | Date: Wed, 25 Sep 2024 02:37:42 +0200 |
| Tim Windelschmidt | d481749 | 2025-06-16 15:03:12 +0200 | [diff] [blame] | 4 | Subject: [PATCH] Support no_std in Prost toolchain |
| Tim Windelschmidt | 1f51cf4 | 2024-10-01 17:04:28 +0200 | [diff] [blame] | 5 | |
| 6 | --- |
| Tim Windelschmidt | d634975 | 2025-01-09 06:43:26 +0100 | [diff] [blame] | 7 | extensions/prost/private/prost.bzl | 8 ++++++++ |
| Tim Windelschmidt | d481749 | 2025-06-16 15:03:12 +0200 | [diff] [blame] | 8 | extensions/prost/private/protoc_wrapper.rs | 23 ++++++++++++++++++++-- |
| 9 | 2 files changed, 29 insertions(+), 2 deletions(-) |
| Tim Windelschmidt | 1f51cf4 | 2024-10-01 17:04:28 +0200 | [diff] [blame] | 10 | |
| Tim Windelschmidt | d634975 | 2025-01-09 06:43:26 +0100 | [diff] [blame] | 11 | diff --git a/extensions/prost/private/prost.bzl b/extensions/prost/private/prost.bzl |
| Tim Windelschmidt | d481749 | 2025-06-16 15:03:12 +0200 | [diff] [blame] | 12 | index c5917107b..b06e126e6 100644 |
| Tim Windelschmidt | d634975 | 2025-01-09 06:43:26 +0100 | [diff] [blame] | 13 | --- a/extensions/prost/private/prost.bzl |
| 14 | +++ b/extensions/prost/private/prost.bzl |
| Tim Windelschmidt | d481749 | 2025-06-16 15:03:12 +0200 | [diff] [blame] | 15 | @@ -89,6 +89,9 @@ def _compile_proto( |
| Tim Windelschmidt | d634975 | 2025-01-09 06:43:26 +0100 | [diff] [blame] | 16 | additional_args.add("--additional_srcs={}".format(",".join([f.path for f in all_additional_srcs.to_list()]))) |
| 17 | additional_args.add_all(prost_toolchain.prost_opts + prost_opts, format_each = "--prost_opt=%s") |
| 18 | |
| Tim Windelschmidt | d481749 | 2025-06-16 15:03:12 +0200 | [diff] [blame] | 19 | + if prost_toolchain.is_no_std: |
| 20 | + additional_args.add("--is_no_std") |
| Tim Windelschmidt | 1f51cf4 | 2024-10-01 17:04:28 +0200 | [diff] [blame] | 21 | + |
| 22 | if prost_toolchain.tonic_plugin: |
| 23 | tonic_plugin = prost_toolchain.tonic_plugin[DefaultInfo].files_to_run |
| 24 | additional_args.add(prost_toolchain.tonic_plugin_flag % tonic_plugin.executable.path) |
| Tim Windelschmidt | d481749 | 2025-06-16 15:03:12 +0200 | [diff] [blame] | 25 | @@ -459,6 +462,7 @@ def _rust_prost_toolchain_impl(ctx): |
| Tim Windelschmidt | 1f51cf4 | 2024-10-01 17:04:28 +0200 | [diff] [blame] | 26 | tonic_runtime = ctx.attr.tonic_runtime, |
| 27 | include_transitive_deps = ctx.attr.include_transitive_deps, |
| Tim Windelschmidt | d481749 | 2025-06-16 15:03:12 +0200 | [diff] [blame] | 28 | compile_well_known_types = ctx.attr.compile_well_known_types, |
| 29 | + is_no_std = ctx.attr.is_no_std, |
| Tim Windelschmidt | 1f51cf4 | 2024-10-01 17:04:28 +0200 | [diff] [blame] | 30 | )] |
| Tim Windelschmidt | d634975 | 2025-01-09 06:43:26 +0100 | [diff] [blame] | 31 | |
| Tim Windelschmidt | 1f51cf4 | 2024-10-01 17:04:28 +0200 | [diff] [blame] | 32 | rust_prost_toolchain = rule( |
| Tim Windelschmidt | d481749 | 2025-06-16 15:03:12 +0200 | [diff] [blame] | 33 | @@ -474,6 +478,10 @@ rust_prost_toolchain = rule( |
| 34 | doc = "Whether to include transitive dependencies. If set to True, all transitive dependencies will directly accessible by the dependent crate.", |
| 35 | default = False, |
| Tim Windelschmidt | 1f51cf4 | 2024-10-01 17:04:28 +0200 | [diff] [blame] | 36 | ), |
| Tim Windelschmidt | d481749 | 2025-06-16 15:03:12 +0200 | [diff] [blame] | 37 | + "is_no_std": attr.bool( |
| Tim Windelschmidt | 1f51cf4 | 2024-10-01 17:04:28 +0200 | [diff] [blame] | 38 | + doc = "If a no_std tag should be put into the generated code.", |
| 39 | + default = False, |
| 40 | + ), |
| Tim Windelschmidt | d481749 | 2025-06-16 15:03:12 +0200 | [diff] [blame] | 41 | "prost_opts": attr.string_list( |
| 42 | doc = "Additional options to add to Prost.", |
| 43 | ), |
| Tim Windelschmidt | d634975 | 2025-01-09 06:43:26 +0100 | [diff] [blame] | 44 | diff --git a/extensions/prost/private/protoc_wrapper.rs b/extensions/prost/private/protoc_wrapper.rs |
| Tim Windelschmidt | d481749 | 2025-06-16 15:03:12 +0200 | [diff] [blame] | 45 | index 878f1c30c..8f09c77fc 100644 |
| Tim Windelschmidt | d634975 | 2025-01-09 06:43:26 +0100 | [diff] [blame] | 46 | --- a/extensions/prost/private/protoc_wrapper.rs |
| 47 | +++ b/extensions/prost/private/protoc_wrapper.rs |
| 48 | @@ -156,8 +156,17 @@ fn generate_lib_rs( |
| Tim Windelschmidt | 1f51cf4 | 2024-10-01 17:04:28 +0200 | [diff] [blame] | 49 | is_tonic: bool, |
| 50 | direct_dep_crate_names: Vec<String>, |
| Tim Windelschmidt | d634975 | 2025-01-09 06:43:26 +0100 | [diff] [blame] | 51 | additional_content: String, |
| Tim Windelschmidt | d481749 | 2025-06-16 15:03:12 +0200 | [diff] [blame] | 52 | + is_no_std: bool, |
| Tim Windelschmidt | 1f51cf4 | 2024-10-01 17:04:28 +0200 | [diff] [blame] | 53 | ) -> String { |
| 54 | - let mut contents = vec!["// @generated".to_string(), "".to_string()]; |
| 55 | + let mut contents = vec![ |
| Tim Windelschmidt | d481749 | 2025-06-16 15:03:12 +0200 | [diff] [blame] | 56 | + if is_no_std { |
| Tim Windelschmidt | d634975 | 2025-01-09 06:43:26 +0100 | [diff] [blame] | 57 | + "#![no_std]".to_string() |
| 58 | + } else { |
| 59 | + "".to_string() |
| 60 | + }, |
| Tim Windelschmidt | 1f51cf4 | 2024-10-01 17:04:28 +0200 | [diff] [blame] | 61 | + "// @generated".to_string(), |
| 62 | + "".to_string(), |
| 63 | + ]; |
| 64 | for crate_name in direct_dep_crate_names { |
| 65 | contents.push(format!("pub use {crate_name};")); |
| 66 | } |
| Tim Windelschmidt | d481749 | 2025-06-16 15:03:12 +0200 | [diff] [blame] | 67 | @@ -471,6 +480,9 @@ struct Args { |
| Tim Windelschmidt | 1f51cf4 | 2024-10-01 17:04:28 +0200 | [diff] [blame] | 68 | /// Whether to generate tonic code. |
| 69 | is_tonic: bool, |
| Tim Windelschmidt | d634975 | 2025-01-09 06:43:26 +0100 | [diff] [blame] | 70 | |
| Tim Windelschmidt | 1f51cf4 | 2024-10-01 17:04:28 +0200 | [diff] [blame] | 71 | + // Whether to put a no_std tag into the generated code. |
| Tim Windelschmidt | d481749 | 2025-06-16 15:03:12 +0200 | [diff] [blame] | 72 | + is_no_std: bool, |
| Tim Windelschmidt | 1f51cf4 | 2024-10-01 17:04:28 +0200 | [diff] [blame] | 73 | + |
| 74 | /// Extra arguments to pass to protoc. |
| 75 | extra_args: Vec<String>, |
| 76 | } |
| Tim Windelschmidt | d481749 | 2025-06-16 15:03:12 +0200 | [diff] [blame] | 77 | @@ -494,6 +506,7 @@ impl Args { |
| Tim Windelschmidt | 1f51cf4 | 2024-10-01 17:04:28 +0200 | [diff] [blame] | 78 | let mut direct_dep_crate_names = Vec::new(); |
| 79 | let mut is_tonic = false; |
| Tim Windelschmidt | d481749 | 2025-06-16 15:03:12 +0200 | [diff] [blame] | 80 | let mut compile_well_known_types = false; |
| 81 | + let mut is_no_std = false; |
| Tim Windelschmidt | d634975 | 2025-01-09 06:43:26 +0100 | [diff] [blame] | 82 | |
| Tim Windelschmidt | 1f51cf4 | 2024-10-01 17:04:28 +0200 | [diff] [blame] | 83 | let mut extra_args = Vec::new(); |
| Tim Windelschmidt | d634975 | 2025-01-09 06:43:26 +0100 | [diff] [blame] | 84 | |
| Tim Windelschmidt | d481749 | 2025-06-16 15:03:12 +0200 | [diff] [blame] | 85 | @@ -516,6 +529,10 @@ impl Args { |
| Tim Windelschmidt | 1f51cf4 | 2024-10-01 17:04:28 +0200 | [diff] [blame] | 86 | is_tonic = true; |
| 87 | return; |
| 88 | } |
| Tim Windelschmidt | d481749 | 2025-06-16 15:03:12 +0200 | [diff] [blame] | 89 | + if arg == "--is_no_std" { |
| 90 | + is_no_std = true; |
| Tim Windelschmidt | 1f51cf4 | 2024-10-01 17:04:28 +0200 | [diff] [blame] | 91 | + return; |
| 92 | + } |
| Tim Windelschmidt | d634975 | 2025-01-09 06:43:26 +0100 | [diff] [blame] | 93 | |
| Tim Windelschmidt | d481749 | 2025-06-16 15:03:12 +0200 | [diff] [blame] | 94 | if arg == "--compile_well_known_types" { |
| 95 | compile_well_known_types = true; |
| 96 | @@ -664,6 +681,7 @@ impl Args { |
| Tim Windelschmidt | 1f51cf4 | 2024-10-01 17:04:28 +0200 | [diff] [blame] | 97 | proto_paths, |
| 98 | direct_dep_crate_names, |
| 99 | is_tonic, |
| Tim Windelschmidt | d481749 | 2025-06-16 15:03:12 +0200 | [diff] [blame] | 100 | + is_no_std, |
| Tim Windelschmidt | 1f51cf4 | 2024-10-01 17:04:28 +0200 | [diff] [blame] | 101 | label: label.unwrap(), |
| 102 | extra_args, |
| Tim Windelschmidt | d481749 | 2025-06-16 15:03:12 +0200 | [diff] [blame] | 103 | compile_well_known_types, |
| 104 | @@ -769,6 +787,7 @@ fn main() { |
| Tim Windelschmidt | 1f51cf4 | 2024-10-01 17:04:28 +0200 | [diff] [blame] | 105 | proto_paths, |
| 106 | direct_dep_crate_names, |
| 107 | is_tonic, |
| Tim Windelschmidt | d481749 | 2025-06-16 15:03:12 +0200 | [diff] [blame] | 108 | + is_no_std, |
| Tim Windelschmidt | 1f51cf4 | 2024-10-01 17:04:28 +0200 | [diff] [blame] | 109 | extra_args, |
| Tim Windelschmidt | d481749 | 2025-06-16 15:03:12 +0200 | [diff] [blame] | 110 | compile_well_known_types, |
| Tim Windelschmidt | 1f51cf4 | 2024-10-01 17:04:28 +0200 | [diff] [blame] | 111 | } = Args::parse().expect("Failed to parse args"); |
| Tim Windelschmidt | d481749 | 2025-06-16 15:03:12 +0200 | [diff] [blame] | 112 | @@ -947,6 +966,7 @@ fn main() { |
| Tim Windelschmidt | d634975 | 2025-01-09 06:43:26 +0100 | [diff] [blame] | 113 | is_tonic, |
| 114 | direct_dep_crate_names, |
| 115 | additional_content, |
| Tim Windelschmidt | d481749 | 2025-06-16 15:03:12 +0200 | [diff] [blame] | 116 | + is_no_std, |
| Tim Windelschmidt | d634975 | 2025-01-09 06:43:26 +0100 | [diff] [blame] | 117 | ), |
| Tim Windelschmidt | 1f51cf4 | 2024-10-01 17:04:28 +0200 | [diff] [blame] | 118 | ) |
| 119 | .expect("Failed to write file."); |
| Tim Windelschmidt | d481749 | 2025-06-16 15:03:12 +0200 | [diff] [blame] | 120 | @@ -1002,7 +1022,6 @@ fn escape_keyword(s: String) -> String { |
| 121 | |
| 122 | #[cfg(test)] |
| 123 | mod test { |
| 124 | - |
| 125 | use super::*; |
| 126 | |
| 127 | use prost_types::{FieldDescriptorProto, ServiceDescriptorProto}; |
| Tim Windelschmidt | d634975 | 2025-01-09 06:43:26 +0100 | [diff] [blame] | 128 | -- |
| Tim Windelschmidt | d481749 | 2025-06-16 15:03:12 +0200 | [diff] [blame] | 129 | 2.49.0 |