Skip to content

Commit

Permalink
Rollup merge of #70969 - ehuss:json-filename-macros, r=eddyb
Browse files Browse the repository at this point in the history
Fix JSON file_name documentation for macros.

JSON `file_name` paths were changed in #66364 for macros to point to actual source files instead of using `<MACRONAME macros>`.

Closes #70396
  • Loading branch information
Centril authored Apr 10, 2020
2 parents 490bdc0 + d6d0799 commit 6f118f2
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions src/doc/rustc/src/json.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,11 @@ Diagnostics have the following format:
"spans": [
{
/* The file where the span is located.
For spans located within a macro expansion, this will be the
name of the expanded macro in the format "<MACRONAME macros>".
Note that this path may not exist. For example, if the path
points to the standard library, and the rust src is not
available in the sysroot, then it may point to a non-existent
file. Beware that this may also point to the source of an
external crate.
*/
"file_name": "lib.rs",
/* The byte offset where the span starts (0-based, inclusive). */
Expand Down

0 comments on commit 6f118f2

Please sign in to comment.