about summary refs log tree commit diff
diff options
context:
space:
mode:
authorCorey Farwell <coreyf@rwell.org>2018-01-09 22:28:25 -0500
committerGitHub <noreply@github.com>2018-01-09 22:28:25 -0500
commit14a9e264ba44ed014a391f740a12f179a8a2e78d (patch)
tree5140fda0da53b438efb21e7cae7b7bc7a3b28b16
parent14284f3646ce113b2afb1aa935f3bc224f629d93 (diff)
parent45221511d45a0272e699387f48509cd34a1f3688 (diff)
downloadrust-14a9e264ba44ed014a391f740a12f179a8a2e78d.tar.gz
rust-14a9e264ba44ed014a391f740a12f179a8a2e78d.zip
Rollup merge of #47285 - AndrewBrinker:master, r=kennytm
Fixed a typo in the compile_error docs

Noticed a typo and fixed it.
-rw-r--r--src/libstd/macros.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/macros.rs b/src/libstd/macros.rs
index 9f3f0ea2742..f058b1caef5 100644
--- a/src/libstd/macros.rs
+++ b/src/libstd/macros.rs
@@ -283,7 +283,7 @@ pub mod builtin {
     /// Unconditionally causes compilation to fail with the given error message when encountered.
     ///
     /// This macro should be used when a crate uses a conditional compilation strategy to provide
-    /// better error messages for errornous conditions.
+    /// better error messages for erroneous conditions.
     ///
     /// # Examples
     ///