lune-org/lune
1
1
Fork 0
mirror of https://github.com/lune-org/lune.git synced 2025-04-16 18:03:57 +01:00
Code Issues Projects Releases Packages Wiki Activity

refactor: use variables instead of inline

Browse source
This commit is contained in:
Erica Marigold 2024-02-25 15:51:02 +05:30
parent 0972b908b7
commit c7834c6b43
No known key found for this signature in database
GPG key ID: 2768CC0C23D245D1
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/lune/util/formatting.rs
View file

@ -123,11 +123,13 @@ pub fn pretty_format_value(
) )
)?, )?,
LuaValue::Table(ref tab) => { LuaValue::Table(ref tab) => {
let table_addr = Some(format!("{:p}", tab.to_pointer()));
if depth >= MAX_FORMAT_DEPTH { if depth >= MAX_FORMAT_DEPTH {
write!(buffer, "{}", STYLE_DIM.apply_to("{ ... }"))?; write!(buffer, "{}", STYLE_DIM.apply_to("{ ... }"))?;
} else if let Some(s) = call_table_tostring_metamethod(tab) { } else if let Some(s) = call_table_tostring_metamethod(tab) {
write!(buffer, "{s}")?; write!(buffer, "{s}")?;
} else if depth >= 1 && parent_table_addr.eq(&Some(format!("{:p}", tab.to_pointer()))) { } else if depth >= 1 && parent_table_addr.eq(&table_addr) {
write!(buffer, "{}", STYLE_DIM.apply_to("<self>"))? write!(buffer, "{}", STYLE_DIM.apply_to("<self>"))?
} else { } else {
let mut is_empty = false; let mut is_empty = false;
@ -194,7 +196,9 @@ pub fn pretty_format_multi_value(multi: &LuaMultiValue) -> LuaResult<String> {
if let LuaValue::String(s) = value { if let LuaValue::String(s) = value {
write!(buffer, "{}", s.to_string_lossy()).into_lua_err()?; write!(buffer, "{}", s.to_string_lossy()).into_lua_err()?;
} else { } else {
pretty_format_value(&mut buffer, value, Some(format!("{:p}", value.to_pointer())), 0).into_lua_err()?; let addr = format!("{:p}", value.to_pointer());
pretty_format_value(&mut buffer, value, Some(addr), 0).into_lua_err()?;
} }
if counter < multi.len() { if counter < multi.len() {
write!(&mut buffer, " ").into_lua_err()?; write!(&mut buffer, " ").into_lua_err()?;