diff options
| author | bors <bors@rust-lang.org> | 2020-06-11 11:17:37 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-06-11 11:17:37 +0000 |
| commit | 50c0192c64241d723066add22c53d472e2b9cba9 (patch) | |
| tree | 06315ed68a5156efe6d78d5a39c7054172c07a05 /src/libcore | |
| parent | 3ddf48053e83f4949d00dcaf6eb8d9e28fc6bb95 (diff) | |
| parent | ba0a8d2ee79e966d270690b7154bd3bfe2ba61aa (diff) | |
Auto merge of #73235 - Dylan-DPC:rollup-zp8oxhg, r=Dylan-DPC
Rollup of 11 pull requests Successful merges: - #72380 (Fix `is_const_context`, update `check_for_cast`) - #72941 (Ensure stack when building MIR for matches) - #72976 (Clean up E0642 explanation) - #73080 (doc/rustdoc: Fix incorrect external_doc feature flag) - #73155 (save_analysis: better handle paths and functions signature) - #73164 (Add new E0762 error code) - #73172 (Fix more clippy warnings) - #73181 (Automatically prioritize unsoundness issues) - #73183 (Support proc macros in intra doc link resolution) - #73208 (Fix doctest template) - #73219 (x.py: with --json-output, forward cargo's JSON) Failed merges: r? @ghost
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/num/mod.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libcore/num/mod.rs b/src/libcore/num/mod.rs index c164e893b4f..fe131de66f1 100644 --- a/src/libcore/num/mod.rs +++ b/src/libcore/num/mod.rs @@ -3309,7 +3309,8 @@ Basic usage: ``` ", $Feature, "assert_eq!(100", stringify!($SelfT), ".saturating_add(1), 101); -assert_eq!(200u8.saturating_add(127), 255);", $EndFeature, " +assert_eq!(", stringify!($SelfT), "::MAX.saturating_add(127), ", stringify!($SelfT), "::MAX);", +$EndFeature, " ```"), #[stable(feature = "rust1", since = "1.0.0")] |