diff options
| author | bors <bors@rust-lang.org> | 2021-01-18 14:36:30 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-01-18 14:36:30 +0000 |
| commit | 5e91c4ecc09312d8b63d250a432b0f3ef83f1df7 (patch) | |
| tree | 994a9e3c43f68368785e414945aa8949e2493c25 /library | |
| parent | 66eb9821666e0672a69a998d2331733c7a8996a5 (diff) | |
| parent | 33d184bfd093460d56a10c8a151b66147d2b4041 (diff) | |
| download | rust-5e91c4ecc09312d8b63d250a432b0f3ef83f1df7.tar.gz rust-5e91c4ecc09312d8b63d250a432b0f3ef83f1df7.zip | |
Auto merge of #81165 - KodrAus:rollup-s7llxis, r=KodrAus
Rollup of 12 pull requests Successful merges: - #81038 (Update Clippy) - #81071 (rustc_parse_format: Fix character indices in find_skips) - #81100 (prevent potential bug in `encode_with_shorthand`.) - #81105 (Initialize a few variables directly) - #81116 (ConstProp: Copy body span instead of querying it) - #81121 (Avoid logging the whole MIR body in SimplifyCfg) - #81123 (Update cmp.rs) - #81125 (Add track_caller to .steal()) - #81128 (validation test: turn some const_err back into validation failures) - #81131 (Edit rustc_middle::ty::cast docs) - #81142 (Replace let Some(..) = with .is_some()) - #81153 (Remove unused linkcheck exceptions) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library')
| -rw-r--r-- | library/core/src/cmp.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/core/src/cmp.rs b/library/core/src/cmp.rs index 38c6bfb0ef3..b983f49eb17 100644 --- a/library/core/src/cmp.rs +++ b/library/core/src/cmp.rs @@ -541,7 +541,7 @@ impl Ordering { /// assert_eq!(result, Ordering::Equal); /// /// let x: (i64, i64, i64) = (1, 2, 7); - /// let y: (i64, i64, i64) = (1, 5, 3); + /// let y: (i64, i64, i64) = (1, 5, 3); /// let result = x.0.cmp(&y.0).then_with(|| x.1.cmp(&y.1)).then_with(|| x.2.cmp(&y.2)); /// /// assert_eq!(result, Ordering::Less); |
