Auto merge of #25381 - mathroc:patch-1, r=alexcrichton

bors · bors · commit af522079a2e1 · 2015-05-14T10:54:44.000Z
closes rust-lang/cargo#1554
diff --git a/src/libsyntax/diagnostic.rs b/src/libsyntax/diagnostic.rs
@@ -506,7 +506,7 @@ fn emit(dst: &mut EmitterWriter, cm: &codemap::CodeMap, rsp: RenderSpan,
             match dst.registry.as_ref().and_then(|registry| registry.find_description(code)) {
                 Some(_) => {
                     try!(print_diagnostic(dst, &ss[..], Help,
-                                          &format!("pass `--explain {}` to see a detailed \
+                                          &format!("run `rustc --explain {}` to see a detailed \
                                                    explanation", code), None));
                 }
                 None => ()

Original file line number	Diff line number	Diff line change
`@@ -506,7 +506,7 @@ fn emit(dst: &mut EmitterWriter, cm: &codemap::CodeMap, rsp: RenderSpan,`
`506`	`506`	`match dst.registry.as_ref().and_then(\|registry\| registry.find_description(code)) {`
`507`	`507`	`Some(_) => {`
`508`	`508`	`try!(print_diagnostic(dst, &ss[..], Help,`
`509`		- &format!("pass `--explain {}` to see a detailed \
	`509`	+ &format!("run `rustc --explain {}` to see a detailed \
`510`	`510`	`explanation", code), None));`
`511`	`511`	`}`
`512`	`512`	`None => ()`