#[instrument]: add ret(err, ok)
#2970
Open
+399
−260
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As proposed in #2963 (comment).
Motivation
Ok
return values#[instrument(ret, err)]
interface feels a little weird becauseret
either means "any return value" or "theOk
return value" depending on whethererr
is also presentSolution
This solution is fully backwards-compatible (i.e. the
#[instrument(ret, err)]
syntax continues to work), but adds a more consistent interface using#[instrument(ret(ok(...), err(...)))]
. As such, it could also be backported to the v0.1.x branch.Trying to use both syntaxes at the same time results in a compile error rather than weird behaviour.
I also cleaned up and fixed the documentation and tests while I was at it (best reviewed commit by commit).