Rollup merge of #52099 - zackmdavis:and_the_case_of_the_typ, r=oli-obk

Mark-Simulacrum · web-flow · commit 967293363958 · 2018-07-06T21:29:16.000-06:00
fix typo in stable `--edition` error message

(diff is self-explanatory)
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,
                 )

Original file line number	Diff line number	Diff line change
`@@ -1816,7 +1816,7 @@ pub fn build_session_options_and_crate_config(`
`1816`	`1816`	`early_error(`
`1817`	`1817`	`ErrorOutputType::default(),`
`1818`	`1818`	`&format!(`
`1819`		`- "Edition {} is unstable an only\`
	`1819`	`+ "Edition {} is unstable and only \`
`1820`	`1820`	`available for nightly builds of rustc.",`
`1821`	`1821`	`edition,`
`1822`	`1822`	`)`