Skip to content

Commit 212118b

Browse files
committed
Minor code improvements
1 parent 2a00a5c commit 212118b

File tree

1 file changed

+8
-13
lines changed

1 file changed

+8
-13
lines changed

Diff for: src/resolve/expr/call.rs

+8-13
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,9 @@ pub fn call_callee(
8585
let arg_concrete_trait = impl_poly_catalog.bake().resolve_trait(&imp.target)?;
8686
let function = ctx.asg.funcs.get(callee.function).unwrap();
8787

88-
let poly_impl_name = if let Some(name) = &impl_using.name {
89-
name.clone()
90-
} else {
91-
function
88+
let poly_impl_name = match &impl_using.name {
89+
Some(name) => name,
90+
None => function
9291
.impl_params
9392
.params
9493
.iter()
@@ -106,15 +105,15 @@ pub fn call_callee(
106105
),
107106
impl_arg.source,
108107
)
109-
})?
110-
.clone()
111-
};
108+
})?,
109+
}
110+
.clone();
112111

113112
if !used_names.insert(poly_impl_name.clone()) {
114113
return Err(ResolveError::other(
115114
format!(
116115
"Implementation for '${}' was already specified",
117-
&poly_impl_name
116+
poly_impl_name
118117
),
119118
impl_arg.source,
120119
));
@@ -124,7 +123,7 @@ pub fn call_callee(
124123
return Err(ResolveError::other(
125124
format!(
126125
"Callee does not have implementation parameter '${}'",
127-
&poly_impl_name
126+
poly_impl_name
128127
),
129128
source,
130129
));
@@ -164,10 +163,6 @@ pub fn call_callee(
164163
let function = ctx.asg.funcs.get(callee.function).unwrap();
165164
let num_required = function.params.required.len();
166165

167-
if !function.impl_params.params.is_empty() {
168-
eprintln!("warning: calling functions with implementation parameters is not fully implemented yet! (more that one implementation parameter is not supported yet)");
169-
}
170-
171166
for (i, arg) in args.iter_mut().enumerate() {
172167
let function = ctx.asg.funcs.get(callee.function).unwrap();
173168

0 commit comments

Comments
 (0)