fix: use Result type aliases in "Wrap return type in Result" assist #18016
Conversation
rustbot
added
the
S-waiting-on-review
|
|
||
| let ret_is_alias = matches!(ty, Some(hir::Adt::Enum(ret_type)) if ret_type == enum_ty); | ||
| if enum_ty != core_result || ret_is_alias { | ||
| // The current name is not a Result alias, or the return type is already this Result alias. |
There was a problem hiding this comment.
We cannot stop looping in the second case since SemanticScope::process_all_names doesn't accept ControlFlow or return an iterator. This is a bit wasteful but I'm sure if its worth modifying the API, thoughts?
There's a good chance this is already possible with different API I missed, but I figured I might as well ask 😅
There was a problem hiding this comment.
I think it'd be nicer for us to expose a resolve_mod_path function on Semantics that takes a ModPath to resolve, then we can just call that with a ModPath::from_segmenst(Plain, iter;:once(sym::Result))
There was a problem hiding this comment.
Sounds good, I've pushed a fix to do so. I'm not entirely sure if the signature is sensible as of now though.
|
|
||
| let ret_is_alias = matches!(ty, Some(hir::Adt::Enum(ret_type)) if ret_type == enum_ty); | ||
| if enum_ty != core_result || ret_is_alias { | ||
| // The current name is not a Result alias, or the return type is already this Result alias. |
There was a problem hiding this comment.
I think it'd be nicer for us to expose a resolve_mod_path function on Semantics that takes a ModPath to resolve, then we can just call that with a ModPath::from_segmenst(Plain, iter;:once(sym::Result))
IvarWithoutBones
force-pushed
the
wrap-return-ty-local-result
branch
from
055ae16
to
77181cd
Compare
This commit makes the "Wrap return type in Result" assist prefer type aliases of standard library type when the are in scope, use at least one generic parameter, and have the name "Result". The last restriction was made in an attempt to avoid false assumptions about which type the user is referring to, but that might be overly strict. We could also do something like this, in order of priority: * Use the alias named "Result". * Use any alias if only a single one is in scope, otherwise: * Use the standard library type. This is easy to add if others feel differently that is appropriate, just let me know.
IvarWithoutBones
force-pushed
the
wrap-return-ty-local-result
branch
from
77181cd
to
4e9d17b
Compare
|
Thanks! |
|
☀️ Test successful - checks-actions |
This commit makes the "Wrap return type in Result" assist prefer type aliases of standard library type when one is in scope, it uses at least one generic parameter, and it has the name
Result.The last restriction was made in an attempt to avoid false assumptions about which type the user is referring to, but that might be overly strict. We could also do something like this, in order of priority:
This is easy to add if others feel differently that is appropriate, just let me know.
Fixes #17796