diff options
| author | bors <bors@rust-lang.org> | 2019-08-08 17:19:22 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-08-08 17:19:22 +0000 |
| commit | 2d1a551e144335e0d60a637d12f410cf65849876 (patch) | |
| tree | 48a18f5e5415a6fc9736a5ff12c497b2ed2b51f5 /src/libcore/macros.rs | |
| parent | 2628f579f6246df385acf9203bf2ffb6aedf5ccc (diff) | |
| parent | 3de450b6865f5ba717b196054b231b16f67b2c17 (diff) | |
| download | rust-2d1a551e144335e0d60a637d12f410cf65849876.tar.gz rust-2d1a551e144335e0d60a637d12f410cf65849876.zip | |
Auto merge of #63380 - Centril:rollup-tzfhtnu, r=Centril
Rollup of 8 pull requests Successful merges: - #63261 (bump rand in libcore/liballoc test suites) - #63316 (Update rustfmt to 1.4.4) - #63332 (Add an overflow check in truncate implementation for Unix.) - #63342 (Don't use remap-path-prefix in dep-info files.) - #63366 (doc: Fix typo in float from bytes methods) - #63370 (Fix ICE #63364) - #63377 (Improved documentation for compile_error!()) - #63379 (Add test for issue 53096) Failed merges: r? @ghost
Diffstat (limited to 'src/libcore/macros.rs')
| -rw-r--r-- | src/libcore/macros.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libcore/macros.rs b/src/libcore/macros.rs index 37cc71bff62..09d2331b60f 100644 --- a/src/libcore/macros.rs +++ b/src/libcore/macros.rs @@ -680,7 +680,7 @@ pub(crate) mod builtin { /// /// This macro should be used when a crate uses a conditional compilation strategy to provide /// better error messages for erroneous conditions. It's the compiler-level form of [`panic!`], - /// which emits an error at *runtime*, rather than during compilation. + /// but emits an error during *compilation* rather than at *runtime*. /// /// # Examples /// |