diff options
| author | Zack M. Davis <code@zackmdavis.net> | 2017-10-30 16:59:34 -0700 |
|---|---|---|
| committer | Zack M. Davis <code@zackmdavis.net> | 2017-10-30 17:11:33 -0700 |
| commit | 42ef3f17841b9de7c6a405645c3c4ad8eded9ca5 (patch) | |
| tree | 7b3421da0cd98db7c819666e64b1a88f46be6afa | |
| parent | f0fe716dbcbf2363ab8f929325d32a17e51039d0 (diff) | |
| download | rust-42ef3f17841b9de7c6a405645c3c4ad8eded9ca5.tar.gz rust-42ef3f17841b9de7c6a405645c3c4ad8eded9ca5.zip | |
edit and fix bad spacing of inner-attribute-not-allowed note
This multiline string literal was missing a backslash, leaving an awkward newline and 35 spaces in the middle of the message. But while we're here, the existing message seems kind of long in comparison to similar notes: to cut it down, we excise the mentions of doc comments, which seems sensible because we know that this erroneous attribute is not a doc comment (notice the `is_sugared_doc: false` at the end of the function; if it had been a doc comment, that error would get set in the `token::DocComment` match branch of `parse_outer_attributes`).
| -rw-r--r-- | src/libsyntax/parse/attr.rs | 9 | ||||
| -rw-r--r-- | src/test/ui/issue-45296.stderr | 3 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/libsyntax/parse/attr.rs b/src/libsyntax/parse/attr.rs index 48c92873e14..053746b579d 100644 --- a/src/libsyntax/parse/attr.rs +++ b/src/libsyntax/parse/attr.rs @@ -105,11 +105,10 @@ impl<'a> Parser<'a> { let span = self.span; self.diagnostic() .struct_span_err(span, reason) - .note("inner attributes and doc comments, like `#![no_std]` or \ - `//! My crate`, annotate the item enclosing them, and are \ - usually found at the beginning of source files. Outer \ - attributes and doc comments, like `#[test]` and - `/// My function`, annotate the item following them.") + .note("inner attributes, like `#![no_std]`, annotate the item \ + enclosing them, and are usually found at the beginning of \ + source files. Outer attributes, like `#[test]`, annotate the \ + item following them.") .emit() } ast::AttrStyle::Inner diff --git a/src/test/ui/issue-45296.stderr b/src/test/ui/issue-45296.stderr index 7bfcac974c5..1a660e4c678 100644 --- a/src/test/ui/issue-45296.stderr +++ b/src/test/ui/issue-45296.stderr @@ -4,8 +4,7 @@ error: an inner attribute is not permitted in this context 14 | #![allow(unused_variables)] | ^ | - = note: inner attributes and doc comments, like `#![no_std]` or `//! My crate`, annotate the item enclosing them, and are usually found at the beginning of source files. Outer attributes and doc comments, like `#[test]` and - `/// My function`, annotate the item following them. + = note: inner attributes, like `#![no_std]`, annotate the item enclosing them, and are usually found at the beginning of source files. Outer attributes, like `#[test]`, annotate the item following them. error: aborting due to previous error |