language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-27 13:59:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fix single tag struct Debug impl

Browse source
This commit is contained in:
Richard Feldman 2022-08-08 19:53:14 -04:00
parent 5d3f7f2967
commit 09a7117237
No known key found for this signature in database
GPG key ID: 7E4127D1E4241798
2 changed files with 20 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

28
crates/glue/src/rust_glue.rs
View file

@ -308,8 +308,6 @@ fn add_single_tag_struct(
impls: &mut IndexMap<Option<String>, IndexMap<String, Vec<TargetInfo>>>,
target_info: TargetInfo,
) {
let unused = (); // TODO need to make this work for more single-tag structs!
// Store single-tag unions as structs rather than enums,
// because they have only one alternative. However, still
// offer the usual tag union APIs.
@ -453,13 +451,26 @@ fn add_single_tag_struct(
{
let opt_impl = Some(format!("impl core::fmt::Debug for {name}"));
let buf = format!(
r#"fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {{
f.write_str("{name}::")?;
let mut buf =
"fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {".to_string();
f.write_str("{tag_name}")
}}"#
);
if payload_fields.is_empty() {
buf.push_str(&format!("f.write_str(\"{name}::{tag_name}\")"));
} else {
buf.push_str(&format!(
"\n{INDENT}{INDENT}{INDENT}f.debug_tuple(\"{name}::{tag_name}\")"
));
for (index, _) in payload_fields.iter().enumerate() {
buf.push_str(&format!(
"{INDENT}{INDENT}{INDENT}{INDENT}.field(&self.f{index})"
));
}
buf.push_str(&format!("{INDENT}{INDENT}{INDENT}{INDENT}.finish()"));
}
buf.push_str(" }\n");
add_decl(impls, opt_impl, target_info, buf);
}
@ -913,7 +924,6 @@ pub struct {name} {{
};
{
let note_to_self = (); // IDEA: make Recursiveness be a 3-way tag, move discriminant info into there
let body = match recursiveness {
Recursiveness::Recursive => {
let pointer_val = if discriminant_size == 0 {

2
crates/glue/tests/test_glue_cli.rs
View file

@ -114,7 +114,7 @@ mod glue_cli_run {
rbt was: Rbt { default: Job::Job(R1 { command: Command::Command(R2 { tool: Tool::SystemTool(R4 { name: "test", num: 42 }) }), inputFiles: ["foo"] }) }
"#),
list_recursive_union:"list-recursive-union" => indoc!(r#"
rbt was: Rbt { default: Job::Job(R1 { command: Command::Command(R2 { args: [], tool: Tool::SystemTool(R3 { name: "test" }) }), inputFiles: ["foo"], job: [] }) }
rbt was: Rbt { default: Job::Job(R1 { command: Command::Command(R2 { args: [], tool: Tool::SystemTool("test") }), inputFiles: ["foo"], job: [] }) }
"#),
}