Skip to content

Fix lint errors with Rust 1.89 #296

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

Closed
theoparis wants to merge 1 commit into from
Closed

Fix lint errors with Rust 1.89 #296

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
7 changes: 6 additions & 1 deletion src-rs/func.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ use crate::{

type MakeFuncImpl = fn(&[Arc<Value>], &mut Evaluator, &mut dyn BufMut) -> Result<()>;

#[derive(PartialEq)]
pub struct FuncInfo {
pub name: &'static [u8],
pub func: MakeFuncImpl,
Expand All @@ -63,6 +62,12 @@ pub struct FuncInfo {
pub trim_right_space_1st: bool,
}

impl PartialEq for FuncInfo {
fn eq(&self, other: &Self) -> bool {
self.name == other.name
}
}

impl Debug for FuncInfo {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(f, "Func({})", String::from_utf8_lossy(self.name))
Expand Down
2 changes: 1 addition & 1 deletion src-rs/parser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -668,7 +668,7 @@ pub struct ParsedAssign<'a> {
pub rhs: &'a [u8],
pub op: AssignOp,
}
pub fn parse_assign_statement(line: &[u8], sep: usize) -> ParsedAssign {
pub fn parse_assign_statement(line: &'_ [u8], sep: usize) -> ParsedAssign<'_> {
Copy link
Copy Markdown
Collaborator

@Colecf Colecf Sep 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove the lifetime on the argument, it's not necessary. Same in var.rs.

assert!(sep != 0);
let mut op = AssignOp::Eq;
let mut lhs = &line[..sep];
Expand Down
2 changes: 1 addition & 1 deletion src-rs/var.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ impl Variable {
}
Ok(())
}
pub fn string(&self) -> Result<Cow<[u8]>> {
pub fn string(&'_ self) -> Result<Cow<'_, [u8]>> {
Ok(match &self.value {
InnerVar::Simple(s) => Cow::Borrowed(s.as_slice()),
InnerVar::Recursive { v: _, orig } => Cow::Borrowed(orig),
Expand Down
Loading