Rollup merge of rust-lang#52099 - zackmdavis:and_the_case_of_the_typ,…

… r=oli-obk fix typo in stable `--edition` error message (diff is self-explanatory)
Mark-Simulacrum · Jul 7, 2018 · 9672933 · 9672933
2 parents 54a440b + bbfdea2
commit 9672933
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/librustc/session/config.rs b/src/librustc/session/config.rs
@@ -1816,7 +1816,7 @@ pub fn build_session_options_and_crate_config(
         early_error(
                 ErrorOutputType::default(),
                 &format!(
-                    "Edition {} is unstable an only\
+                    "Edition {} is unstable and only \
                     available for nightly builds of rustc.",
                     edition,
                 )