Skip to content

Commit

Permalink
Unrolled build for rust-lang#123595
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#123595 - balaganesh102004:master, r=joboet

Documentation fix

Changed "It must not be an identical residual when interconversion is involved" to "The residual is not mandated to be identical when interconversion is involved." as the previous parenthetical appears to state that the residual is not permitted to be identical when interconversion is involved. However the intention of the original wording was to convey that the residual is not required to be identical when interconversion is involved, which makes more sense contextually.
  • Loading branch information
rust-timer authored Apr 8, 2024
2 parents 75fd074 + 8f6ebf6 commit 9e21b24
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion library/core/src/ops/try_trait.rs
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ pub trait FromResidual<R = <Self as Try>::Residual> {
/// This should be implemented consistently with the `branch` method such
/// that applying the `?` operator will get back an equivalent residual:
/// `FromResidual::from_residual(r).branch() --> ControlFlow::Break(r)`.
/// (It must not be an *identical* residual when interconversion is involved.)
/// (The residual is not mandated to be *identical* when interconversion is involved.)
///
/// # Examples
///
Expand Down

0 comments on commit 9e21b24

Please sign in to comment.