about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2024-04-08 14:31:11 +0200
committerGitHub <noreply@github.com>2024-04-08 14:31:11 +0200
commit5c3559df63840eaa106bde88f9469a3a0363e5ea (patch)
tree8808f06fef58bf04c1c968ac9ba69a8b50855629
parent17c94b5f121ce05547ba5e47bfb1bfd6da317ee2 (diff)
parent8f6ebf608db7759d0ca673b24bc9c7810484f169 (diff)
Rollup merge of #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.
-rw-r--r--library/core/src/ops/try_trait.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/library/core/src/ops/try_trait.rs b/library/core/src/ops/try_trait.rs
index 3f8c8efd416..483f55b2070 100644
--- a/library/core/src/ops/try_trait.rs
+++ b/library/core/src/ops/try_trait.rs
@@ -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
     ///