fix up quotes, improve short messages, add notes

Author: AlisdairO

src/librustc_resolve/diagnostics.rs

@@ -201,7 +201,7 @@ 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
+that you attempted to write a `pub use` against a type or value that was
 not itself public.
 
 Here is an example that demonstrates the error:
@@ -214,7 +214,7 @@ pub use foo::X;
 ```
 
 The solution to this problem is to ensure that the items that you are
-re-exporting are themselves marked with 'pub':
+re-exporting are themselves marked with `pub`:
 
 ```
 mod foo {
@@ -223,15 +223,15 @@ mod foo {
 pub use foo::X;
 ```
 
-See the Use Declarations section of the reference for more information
+See the 'Use Declarations' section of the reference for more information
 on this topic:
 
 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
+that you attempted to write a `pub use` against a module that was
 not itself public.
 
 Here is an example that demonstrates the error:
@@ -244,7 +244,7 @@ pub use foo as foo2;
 
 ```
 The solution to this problem is to ensure that the module that you are
-re-exporting is itself marked with 'pub':
+re-exporting is itself marked with `pub`:
 
 ```
 pub mod foo {
@@ -253,7 +253,7 @@ pub mod foo {
 pub use foo as foo2;
 ```
 
-See the Use Declarations section of the reference for more information
+See the 'Use Declarations' section of the reference for more information
 on this topic:
 
 http://doc.rust-lang.org/reference.html#use-declarations

src/librustc_resolve/resolve_imports.rs

@@ -431,8 +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", 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;
                     }
                 }
@@ -441,8 +444,11 @@ 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", token::get_name(source));
+                        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));
                         span_err!(self.resolver.session, directive.span, E0365, "{}", &msg);
+                        self.resolver.session.span_note(directive.span, &note_msg);
                     }
                 }
             }