Skip to content

Commit 2266e52

Browse files
committed
Minor code improvements for passing trait implementations
1 parent 0997fe0 commit 2266e52

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

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

+10-11
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ fn try_register_specified_impl(
119119
arg_concrete_trait: &GenericTraitRef,
120120
impl_params: &ImplParams,
121121
) -> Result<(), ResolveError> {
122-
let target_poly_impl = match &using.name {
122+
let target_param = match &using.name {
123123
Some(name_and_source) => name_and_source.as_ref(),
124124
None => Sourced::new(
125125
callee_func
@@ -146,24 +146,23 @@ fn try_register_specified_impl(
146146
}
147147
.clone();
148148

149-
let Some(param_generic_trait) = impl_params.params.get(target_poly_impl.inner().as_str())
150-
else {
149+
let Some(param_generic_trait) = impl_params.params.get(target_param.inner().as_str()) else {
151150
return Err(ResolveError::other(
152151
format!(
153152
"No implementation parameter named '${}' exists on callee",
154-
target_poly_impl.inner()
153+
target_param.inner()
155154
),
156-
target_poly_impl.source,
155+
target_param.source,
157156
));
158157
};
159158

160-
if !used_names.insert(target_poly_impl.inner().to_string()) {
159+
if !used_names.insert(target_param.inner().to_string()) {
161160
return Err(ResolveError::other(
162161
format!(
163162
"Implementation for '${}' was already specified",
164-
target_poly_impl.inner()
163+
target_param.inner()
165164
),
166-
target_poly_impl.source,
165+
target_param.source,
167166
));
168167
}
169168

@@ -183,15 +182,15 @@ fn try_register_specified_impl(
183182
callee
184183
.recipe
185184
.polymorphs
186-
.insert(target_poly_impl.inner().to_string(), poly_value)
185+
.insert(target_param.inner().to_string(), poly_value)
187186
.is_some()
188187
.then(|| {
189188
ResolveError::other(
190189
format!(
191190
"Multiple implementations were specified for implementation parameter '${}'",
192-
target_poly_impl.inner()
191+
target_param.inner()
193192
),
194-
target_poly_impl.source,
193+
target_param.source,
195194
)
196195
})
197196
.map_or(Ok(()), Err)

0 commit comments

Comments
 (0)