language-servers/erg
1
0
Fork 0
mirror of https://github.com/erg-lang/erg.git synced 2025-09-29 12:24:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: warnings

Browse source
This commit is contained in:
GreasySlug 2025-06-28 14:30:26 +09:00
parent 93eb803ee3
commit 2709fffb4c
7 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/erg_common/build.rs
View file

@ -27,6 +27,6 @@ fn main() -> std::io::Result<()> {
} else { } else {
true true
}; };
println!("cargo:rustc-env=CASE_SENSITIVE={}", case_sensitive); println!("cargo:rustc-env=CASE_SENSITIVE={case_sensitive}");
Ok(()) Ok(())
} }

4
crates/erg_compiler/hir.rs
View file

@ -1982,8 +1982,8 @@ pub enum GuardClause {
impl NestedDisplay for GuardClause { impl NestedDisplay for GuardClause {
fn fmt_nest(&self, f: &mut std::fmt::Formatter<'_>, _level: usize) -> std::fmt::Result { fn fmt_nest(&self, f: &mut std::fmt::Formatter<'_>, _level: usize) -> std::fmt::Result {
match self { match self {
GuardClause::Condition(cond) => write!(f, "{}", cond), GuardClause::Condition(cond) => write!(f, "{cond}"),
GuardClause::Bind(bind) => write!(f, "{}", bind), GuardClause::Bind(bind) => write!(f, "{bind}"),
} }
} }
} }

8
crates/erg_compiler/ty/codeobj.rs
View file

@ -642,14 +642,14 @@ impl CodeObj {
write!(instrs, "{arg} ({})", self.cellvars[arg]).unwrap(); write!(instrs, "{arg} ({})", self.cellvars[arg]).unwrap();
} }
Opcode308::JUMP_ABSOLUTE => { Opcode308::JUMP_ABSOLUTE => {
write!(instrs, "{arg} (to {})", arg).unwrap(); write!(instrs, "{arg} (to {arg})").unwrap();
} }
Opcode308::JUMP_FORWARD => { Opcode308::JUMP_FORWARD => {
write!(instrs, "{arg} (to {})", idx + arg + 2).unwrap(); write!(instrs, "{arg} (to {})", idx + arg + 2).unwrap();
} }
// REVIEW: *2? // REVIEW: *2?
Opcode308::POP_JUMP_IF_FALSE | Opcode308::POP_JUMP_IF_TRUE => { Opcode308::POP_JUMP_IF_FALSE | Opcode308::POP_JUMP_IF_TRUE => {
write!(instrs, "{arg} (to {})", arg).unwrap(); write!(instrs, "{arg} (to {arg})").unwrap();
} }
Opcode308::BINARY_ADD Opcode308::BINARY_ADD
| Opcode308::BINARY_SUBTRACT | Opcode308::BINARY_SUBTRACT
@ -690,14 +690,14 @@ impl CodeObj {
write!(instrs, "{arg} ({})", self.cellvars[arg]).unwrap(); write!(instrs, "{arg} ({})", self.cellvars[arg]).unwrap();
} }
Opcode309::JUMP_ABSOLUTE => { Opcode309::JUMP_ABSOLUTE => {
write!(instrs, "{arg} (to {})", arg).unwrap(); write!(instrs, "{arg} (to {arg})").unwrap();
} }
Opcode309::JUMP_FORWARD => { Opcode309::JUMP_FORWARD => {
write!(instrs, "{arg} (to {})", idx + arg + 2).unwrap(); write!(instrs, "{arg} (to {})", idx + arg + 2).unwrap();
} }
// REVIEW: *2? // REVIEW: *2?
Opcode309::POP_JUMP_IF_FALSE | Opcode309::POP_JUMP_IF_TRUE => { Opcode309::POP_JUMP_IF_FALSE | Opcode309::POP_JUMP_IF_TRUE => {
write!(instrs, "{arg} (to {})", arg).unwrap(); write!(instrs, "{arg} (to {arg})").unwrap();
} }
Opcode309::BINARY_ADD Opcode309::BINARY_ADD
| Opcode309::BINARY_SUBTRACT | Opcode309::BINARY_SUBTRACT

4
crates/erg_compiler/ty/constructors.rs
View file

@ -183,12 +183,12 @@ pub fn try_v_enum(s: Set<ValueObj>) -> Result<Type, Set<ValueObj>> {
} }
pub fn v_enum(s: Set<ValueObj>) -> Type { pub fn v_enum(s: Set<ValueObj>) -> Type {
try_v_enum(s).unwrap_or_else(|set| panic!("not homogeneous: {}", set)) try_v_enum(s).unwrap_or_else(|set| panic!("not homogeneous: {set}"))
} }
pub fn t_enum(s: Set<Type>) -> Type { pub fn t_enum(s: Set<Type>) -> Type {
try_v_enum(s.into_iter().map(ValueObj::builtin_type).collect()) try_v_enum(s.into_iter().map(ValueObj::builtin_type).collect())
.unwrap_or_else(|set| panic!("not homogeneous: {}", set)) .unwrap_or_else(|set| panic!("not homogeneous: {set}"))
} }
pub fn t_singleton(t: Type) -> Type { pub fn t_singleton(t: Type) -> Type {

2
crates/erg_compiler/ty/mod.rs
View file

@ -451,7 +451,7 @@ impl LimitedDisplay for SubrType {
} }
write!(f, "*")?; write!(f, "*")?;
if let Some(name) = var_params.name() { if let Some(name) = var_params.name() {
write!(f, "{}: ", name)?; write!(f, "{name}: ")?;
} }
var_params.typ().limited_fmt(f, limit - 1)?; var_params.typ().limited_fmt(f, limit - 1)?;
} }

24
crates/erg_parser/ast.rs
View file

@ -2162,19 +2162,19 @@ impl NestedDisplay for Call {
if i != 0 { if i != 0 {
write!(f, ", ")?; write!(f, ", ")?;
} }
write!(f, "{}", arg)?; write!(f, "{arg}")?;
} }
if let Some(rest) = self.args.var_args.as_ref() { if let Some(rest) = self.args.var_args.as_ref() {
if !self.args.pos_args().is_empty() { if !self.args.pos_args().is_empty() {
write!(f, ", ")?; write!(f, ", ")?;
} }
write!(f, "*{}", rest)?; write!(f, "*{rest}")?;
} }
for (i, kw_arg) in self.args.kw_args().iter().enumerate() { for (i, kw_arg) in self.args.kw_args().iter().enumerate() {
if i != 0 || !self.args.pos_args().is_empty() || self.args.var_args.is_some() { if i != 0 || !self.args.pos_args().is_empty() || self.args.var_args.is_some() {
write!(f, ", ")?; write!(f, ", ")?;
} }
write!(f, "{}", kw_arg)?; write!(f, "{kw_arg}")?;
} }
write!(f, ")") write!(f, ")")
} else { } else {
@ -3194,7 +3194,7 @@ impl NestedDisplay for ConstApp {
fn fmt_nest(&self, f: &mut std::fmt::Formatter<'_>, level: usize) -> std::fmt::Result { fn fmt_nest(&self, f: &mut std::fmt::Formatter<'_>, level: usize) -> std::fmt::Result {
writeln!(f, "{}", self.obj)?; writeln!(f, "{}", self.obj)?;
if let Some(attr_name) = &self.attr_name { if let Some(attr_name) = &self.attr_name {
writeln!(f, "{}", attr_name)?; writeln!(f, "{attr_name}")?;
} }
writeln!(f, "(")?; writeln!(f, "(")?;
self.args.fmt_nest(f, level + 1)?; self.args.fmt_nest(f, level + 1)?;
@ -4446,11 +4446,11 @@ impl fmt::Display for VarName {
#[pymethods] #[pymethods]
impl VarName { impl VarName {
pub fn __repr__(&self) -> String { pub fn __repr__(&self) -> String {
format!("VarName({})", self) format!("VarName({self})")
} }
pub fn __str__(&self) -> String { pub fn __str__(&self) -> String {
format!("VarName({})", self) format!("VarName({self})")
} }
#[staticmethod] #[staticmethod]
@ -4715,11 +4715,11 @@ impl From<Identifier> for Expr {
#[pymethods] #[pymethods]
impl Identifier { impl Identifier {
pub fn __repr__(&self) -> String { pub fn __repr__(&self) -> String {
format!("Identifier({})", self) format!("Identifier({self})")
} }
pub fn __str__(&self) -> String { pub fn __str__(&self) -> String {
format!("Identifier({})", self) format!("Identifier({self})")
} }
pub fn is_const(&self) -> bool { pub fn is_const(&self) -> bool {
@ -5245,11 +5245,11 @@ impl VarSignature {
} }
pub fn __repr__(&self) -> String { pub fn __repr__(&self) -> String {
format!("VarSignature({})", self) format!("VarSignature({self})")
} }
pub fn __str__(&self) -> String { pub fn __str__(&self) -> String {
format!("VarSignature({})", self) format!("VarSignature({self})")
} }
} }
@ -5704,8 +5704,8 @@ pub enum GuardClause {
impl NestedDisplay for GuardClause { impl NestedDisplay for GuardClause {
fn fmt_nest(&self, f: &mut std::fmt::Formatter<'_>, _level: usize) -> std::fmt::Result { fn fmt_nest(&self, f: &mut std::fmt::Formatter<'_>, _level: usize) -> std::fmt::Result {
match self { match self {
Self::Condition(cond) => write!(f, "{}", cond), Self::Condition(cond) => write!(f, "{cond}"),
Self::Bind(def) => write!(f, "{}", def), Self::Bind(def) => write!(f, "{def}"),
} }
} }
} }

2
src/dummy.rs
View file

@ -454,7 +454,7 @@ impl PackageManagerRunner {
{ {
Ok(out) => ExitStatus::new(out.status.code().unwrap_or(0), 0, 0), Ok(out) => ExitStatus::new(out.status.code().unwrap_or(0), 0, 0),
Err(err) => { Err(err) => {
eprintln!("Error: {}", err); eprintln!("Error: {err}");
ExitStatus::ERR1 ExitStatus::ERR1
} }
} }