Skip to content

Return Cow instead of String from chunkid #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Shatur wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −9
Open

Return Cow instead of String from chunkid #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//! - `LUA_ERRMEM` (4) — memory allocation error
//! - `LUA_ERRERR` (5) — error in error handler

use std::fmt;
use std::{borrow::Cow, fmt};

/// Result type alias used throughout rilua.
pub type LuaResult<T> = Result<T, LuaError>;
Expand Down Expand Up @@ -176,31 +176,31 @@ const LUA_IDSIZE: usize = 60;
/// - `"=name"` -> `"name"` (literal, truncated to `LUA_IDSIZE`)
/// - `"@filename"` -> `"filename"` (file, with `"..."` prefix if too long)
/// - other -> `[string "first_line..."]`
pub fn chunkid(source: &str) -> String {
pub fn chunkid<'a>(source: &'a str) -> Cow<'a, str> {
if let Some(rest) = source.strip_prefix('=') {
// Literal name -- strip the '=' prefix.
if rest.len() < LUA_IDSIZE {
rest.to_string()
rest.into()
} else {
rest[..LUA_IDSIZE - 1].to_string()
rest[..LUA_IDSIZE - 1].into()
}
} else if let Some(rest) = source.strip_prefix('@') {
// File name.
if rest.len() < LUA_IDSIZE {
rest.to_string()
rest.into()
} else {
let skip = rest.len() - (LUA_IDSIZE - 4);
format!("...{}", &rest[skip..])
format!("...{}", &rest[skip..]).into()
}
} else {
// String source.
let first_line = source.split('\n').next().unwrap_or(source);
let max_len = LUA_IDSIZE - "[string \"...\"]".len();
if first_line.len() <= max_len && !source.contains('\n') {
format!("[string \"{first_line}\"]")
format!("[string \"{first_line}\"]").into()
} else {
let truncated = &first_line[..first_line.len().min(max_len)];
format!("[string \"{truncated}...\"]")
format!("[string \"{truncated}...\"]").into()
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/stdlib/debug.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,7 @@ fn extract_closure_info(
Closure::Lua(lcl) => ClosureInfo {
is_lua: true,
source: lcl.proto.source.clone(),
short_src: chunkid(&lcl.proto.source),
short_src: chunkid(&lcl.proto.source).into(),
line_defined: i64::from(lcl.proto.line_defined),
last_line_defined: i64::from(lcl.proto.last_line_defined),
what: if lcl.proto.line_defined == 0 {
Expand Down