Skip to content

chore(common): rm useless mutable #10405

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

Merged
kdy1 merged 1 commit into from
Apr 30, 2025
Merged

chore(common): rm useless mutable #10405

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
24 changes: 12 additions & 12 deletions crates/swc_common/src/input.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,20 +74,20 @@ impl<'a> From<&'a SourceFile> for StringInput<'a> {

impl Input for StringInput<'_> {
#[inline]
fn cur(&mut self) -> Option<char> {
fn cur(&self) -> Option<char> {
self.iter.clone().next()
}

#[inline]
fn peek(&mut self) -> Option<char> {
fn peek(&self) -> Option<char> {
let mut iter = self.iter.clone();
// https://github.com/rust-lang/rust/blob/1.86.0/compiler/rustc_lexer/src/cursor.rs#L56 say `next` is faster.
iter.next();
iter.next()
}

#[inline]
fn peek_ahead(&mut self) -> Option<char> {
fn peek_ahead(&self) -> Option<char> {
let mut iter = self.iter.clone();
// https://github.com/rust-lang/rust/blob/1.86.0/compiler/rustc_lexer/src/cursor.rs#L56 say `next` is faster
iter.next();
Expand All @@ -107,7 +107,7 @@ impl Input for StringInput<'_> {
}

#[inline]
fn cur_as_ascii(&mut self) -> Option<u8> {
fn cur_as_ascii(&self) -> Option<u8> {
let first_byte = *self.as_str().as_bytes().first()?;
if first_byte <= 0x7f {
Some(first_byte)
Expand All @@ -123,7 +123,7 @@ impl Input for StringInput<'_> {

/// TODO(kdy1): Remove this?
#[inline]
fn cur_pos(&mut self) -> BytePos {
fn cur_pos(&self) -> BytePos {
self.last_pos
}

Expand Down Expand Up @@ -211,7 +211,7 @@ impl Input for StringInput<'_> {
}

#[inline]
fn is_byte(&mut self, c: u8) -> bool {
fn is_byte(&self, c: u8) -> bool {
self.iter
.as_str()
.as_bytes()
Expand All @@ -238,9 +238,9 @@ impl Input for StringInput<'_> {
}

pub trait Input: Clone {
fn cur(&mut self) -> Option<char>;
fn peek(&mut self) -> Option<char>;
fn peek_ahead(&mut self) -> Option<char>;
fn cur(&self) -> Option<char>;
fn peek(&self) -> Option<char>;
fn peek_ahead(&self) -> Option<char>;

/// # Safety
///
Expand All @@ -251,7 +251,7 @@ pub trait Input: Clone {
/// Returns [None] if it's end of input **or** current character is not an
/// ascii character.
#[inline]
fn cur_as_ascii(&mut self) -> Option<u8> {
fn cur_as_ascii(&self) -> Option<u8> {
self.cur().and_then(|i| {
if i.is_ascii() {
return Some(i as u8);
Expand All @@ -262,7 +262,7 @@ pub trait Input: Clone {

fn is_at_start(&self) -> bool;

fn cur_pos(&mut self) -> BytePos;
fn cur_pos(&self) -> BytePos;

fn last_pos(&self) -> BytePos;

Expand Down Expand Up @@ -293,7 +293,7 @@ pub trait Input: Clone {
/// `c` must be ASCII.
#[inline]
#[allow(clippy::wrong_self_convention)]
Copy link
Contributor

@mischnic mischnic Apr 24, 2025

Choose a reason for hiding this comment

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

That clippy warning is probably gone as well then.

Suggested change
#[allow(clippy::wrong_self_convention)]

fn is_byte(&mut self, c: u8) -> bool {
fn is_byte(&self, c: u8) -> bool {
match self.cur() {
Some(ch) => ch == c as char,
_ => false,
Expand Down
Loading