alter wording, fix formatting issues

Author: AlisdairO

src/librustc_resolve/diagnostics.rs

@@ -200,9 +200,8 @@ http://doc.rust-lang.org/reference.html#types
 "##,
 
 E0364: r##"
-Private items cannot be publicly re-exported.  This error indicates
-that you attempted to write a `pub use` against a type or value that was
-not itself public.
+Private items cannot be publicly re-exported.  This error indicates that
+you attempted to `pub use` a type or value that was not itself public.
 
 Here is an example that demonstrates the error:
 
@@ -231,8 +230,7 @@ http://doc.rust-lang.org/reference.html#use-declarations
 
 E0365: r##"
 Private modules cannot be publicly re-exported.  This error indicates
-that you attempted to write a `pub use` against a module that was
-not itself public.
+that you attempted to `pub use` a module that was not itself public.
 
 Here is an example that demonstrates the error:
 

src/librustc_resolve/resolve_imports.rs

@@ -431,9 +431,11 @@ impl<'a, 'b:'a, 'tcx:'b> ImportResolver<'a, 'b, 'tcx> {
                     value_result = BoundResult(target_module.clone(),
                                                (*child_name_bindings).clone());
                     if directive.is_public && !child_name_bindings.is_public(ValueNS) {
-                        let msg = format!("`{}` is private, and cannot be reexported", token::get_name(source));
-                        let note_msg =  format!("Consider marking `{}` as pub in the imported module",
-                                                token::get_name(source));
+                        let msg = format!("`{}` is private, and cannot be reexported",
+                                          token::get_name(source));
+                        let note_msg =
+                            format!("Consider marking `{}` as `pub` in the imported module",
+                                    token::get_name(source));
                         span_err!(self.resolver.session, directive.span, E0364, "{}", &msg);
                         self.resolver.session.span_note(directive.span, &note_msg);
                         pub_err = true;
@@ -444,9 +446,10 @@ impl<'a, 'b:'a, 'tcx:'b> ImportResolver<'a, 'b, 'tcx> {
                     type_result = BoundResult(target_module.clone(),
                                               (*child_name_bindings).clone());
                     if !pub_err && directive.is_public && !child_name_bindings.is_public(TypeNS) {
-                        let msg = format!("`{}` is private, and cannot be reexported", token::get_name(source));
-                        let note_msg =  format!("Consider changing module {} so that it is declared as `pub mod`",
-                                                token::get_name(source));
+                        let msg = format!("`{}` is private, and cannot be reexported",
+                                          token::get_name(source));
+                        let note_msg = format!("Consider declaring module {} as `pub mod`",
+                                               token::get_name(source));
                         span_err!(self.resolver.session, directive.span, E0365, "{}", &msg);
                         self.resolver.session.span_note(directive.span, &note_msg);
                     }