aboutsummaryrefslogtreecommitdiff
path: root/mingling_macros
diff options
context:
space:
mode:
authorWeicao-CatilGrass <1992414357@qq.com>2026-05-22 07:58:02 +0800
committerWeicao-CatilGrass <1992414357@qq.com>2026-05-22 07:58:02 +0800
commit16f1722894a5be67831a0382f48937118ddd176b (patch)
tree1a23a6e82058966c206009358f5e6587c57b3d5b /mingling_macros
parente4a4e3e2b558d771537c7a4c0ba22f0d6b541b6e (diff)
Rename injected renderer parameter from `r` to `__renderer_inner_result`
Diffstat (limited to 'mingling_macros')
-rw-r--r--mingling_macros/src/dispatcher_clap.rs2
-rw-r--r--mingling_macros/src/help.rs12
-rw-r--r--mingling_macros/src/lib.rs6
-rw-r--r--mingling_macros/src/render.rs4
-rw-r--r--mingling_macros/src/renderer.rs18
5 files changed, 21 insertions, 21 deletions
diff --git a/mingling_macros/src/dispatcher_clap.rs b/mingling_macros/src/dispatcher_clap.rs
index bb40404..42b5276 100644
--- a/mingling_macros/src/dispatcher_clap.rs
+++ b/mingling_macros/src/dispatcher_clap.rs
@@ -212,7 +212,7 @@ pub fn dispatcher_clap_attr(attr: TokenStream, item: TokenStream) -> TokenStream
::mingling::ClapHelpPrintBehaviour::WriteToRenderResult => {
<#struct_name as ::clap::CommandFactory>::command()
.color(ColorChoice::Always)
- .write_help(r)
+ .write_help(__renderer_inner_result)
.unwrap();
}
::mingling::ClapHelpPrintBehaviour::PrintDirectly => {
diff --git a/mingling_macros/src/help.rs b/mingling_macros/src/help.rs
index 7ce9e83..341f340 100644
--- a/mingling_macros/src/help.rs
+++ b/mingling_macros/src/help.rs
@@ -119,11 +119,11 @@ pub fn help_attr(item: TokenStream) -> TokenStream {
impl ::mingling::HelpRequest for #struct_name {
type Entry = #entry_type;
- fn render_help(#prev_param: Self::Entry, r: &mut ::mingling::RenderResult) {
- // Create a local wrapper function that includes r parameter
- // This allows r_println! to access r
+ fn render_help(#prev_param: Self::Entry, __renderer_inner_result: &mut ::mingling::RenderResult) {
+ // Create a local wrapper function that includes `__renderer_inner_result` parameter
+ // This allows r_println! to access `__renderer_inner_result`
#[allow(non_snake_case)]
- fn help_wrapper(#prev_param: #entry_type, r: &mut ::mingling::RenderResult) {
+ fn help_wrapper(#prev_param: #entry_type, __renderer_inner_result: &mut ::mingling::RenderResult) {
#fn_body
}
@@ -134,11 +134,11 @@ pub fn help_attr(item: TokenStream) -> TokenStream {
::mingling::macros::register_help!(#entry_type, #struct_name);
- // Keep the original function for internal use (without r parameter)
+ // Keep the original function for internal use (without `__renderer_inner_result` parameter)
#(#fn_attrs)*
#vis fn #fn_name(#prev_param: #entry_type) {
let mut dummy_r = ::mingling::RenderResult::default();
- let r = &mut dummy_r;
+ let __renderer_inner_result = &mut dummy_r;
#fn_body
}
};
diff --git a/mingling_macros/src/lib.rs b/mingling_macros/src/lib.rs
index 29c46b4..1733470 100644
--- a/mingling_macros/src/lib.rs
+++ b/mingling_macros/src/lib.rs
@@ -328,7 +328,7 @@ pub fn dispatcher(input: TokenStream) -> TokenStream {
/// Prints formatted text to the current `RenderResult` buffer within a
/// `#[renderer]`(macro.renderer.html) function.
///
-/// This macro requires a mutable reference to a `RenderResult` named `r`
+/// This macro requires a mutable reference to a `RenderResult` named `__renderer_inner_result`
/// to be in scope, which is automatically provided inside `#[renderer]`
/// functions.
///
@@ -362,7 +362,7 @@ pub fn r_print(input: TokenStream) -> TokenStream {
/// Prints formatted text followed by a newline to the current `RenderResult`
/// buffer within a `#[renderer]`(macro.renderer.html) function.
///
-/// This macro requires a mutable reference to a `RenderResult` named `r`
+/// This macro requires a mutable reference to a `RenderResult` named `__renderer_inner_result`
/// to be in scope, which is automatically provided inside `#[renderer]`
/// functions.
///
@@ -1452,7 +1452,7 @@ pub fn program_final_gen(input: TokenStream) -> TokenStream {
::mingling::__dispatch_program_chains!(
#(#chain_tokens)*
);
- fn render_help(any: ::mingling::AnyOutput<Self::Enum>, r: &mut ::mingling::RenderResult) {
+ fn render_help(any: ::mingling::AnyOutput<Self::Enum>, __renderer_inner_result: &mut ::mingling::RenderResult) {
match any.member_id {
#(#help_tokens)*
_ => (),
diff --git a/mingling_macros/src/render.rs b/mingling_macros/src/render.rs
index 63ec49c..10fce7d 100644
--- a/mingling_macros/src/render.rs
+++ b/mingling_macros/src/render.rs
@@ -22,7 +22,7 @@ pub fn r_print(input: TokenStream) -> TokenStream {
let expanded = quote! {
{
let formatted = #format_call;
- ::mingling::RenderResult::print(r, &formatted)
+ ::mingling::RenderResult::print(__renderer_inner_result, &formatted)
}
};
@@ -48,7 +48,7 @@ pub fn r_println(input: TokenStream) -> TokenStream {
let expanded = quote! {
{
let formatted = #format_call;
- ::mingling::RenderResult::println(r, &formatted)
+ ::mingling::RenderResult::println(__renderer_inner_result, &formatted)
}
};
diff --git a/mingling_macros/src/renderer.rs b/mingling_macros/src/renderer.rs
index d2c2221..8e0a43a 100644
--- a/mingling_macros/src/renderer.rs
+++ b/mingling_macros/src/renderer.rs
@@ -118,16 +118,16 @@ pub fn renderer_attr(item: TokenStream) -> TokenStream {
impl ::mingling::Renderer for #struct_name {
type Previous = #previous_type;
- fn render(#prev_param: Self::Previous, r: &mut ::mingling::RenderResult) {
- // Create a local wrapper function that includes r parameter
- // This allows r_println! to access r
+ fn render(#prev_param: Self::Previous, __renderer_inner_result: &mut ::mingling::RenderResult) {
+ // Create a local wrapper function that includes `__renderer_inner_result` parameter
+ // This allows r_println! to access `__renderer_inner_result`
#[allow(non_snake_case)]
- fn render_wrapper(#prev_param: #previous_type, r: &mut ::mingling::RenderResult) {
+ fn render_wrapper(#prev_param: #previous_type, __renderer_inner_result: &mut ::mingling::RenderResult) {
#fn_body
}
// Call the wrapper function
- render_wrapper(#prev_param, r);
+ render_wrapper(#prev_param, __renderer_inner_result);
}
}
@@ -137,7 +137,7 @@ pub fn renderer_attr(item: TokenStream) -> TokenStream {
let #prev_param = #prev_param.into();
let mut dummy_r = ::mingling::RenderResult::default();
{
- let r = &mut dummy_r;
+ let __renderer_inner_result = &mut dummy_r;
#fn_body
}
dummy_r
@@ -172,9 +172,9 @@ pub fn build_general_renderer_entry(previous_type: &TypePath) -> proc_macro2::To
// SAFETY: Only types that match will enter this branch for forced conversion,
// and `AnyOutput::new` ensures the type implements serde::Serialize
let raw = unsafe { any.restore::<#previous_type>().unwrap_unchecked() };
- let mut r = ::mingling::RenderResult::default();
- ::mingling::GeneralRenderer::render(&raw, setting, &mut r)?;
- Ok(r)
+ let mut __renderer_inner_result = ::mingling::RenderResult::default();
+ ::mingling::GeneralRenderer::render(&raw, setting, &mut __renderer_inner_result)?;
+ Ok(__renderer_inner_result)
}
}
}