fix -Zast-json to output correct JSON form #71284

JOE1994 · 2020-04-18T13:34:25Z

fixes #71086 (Reverts some of the changes made in #70215)

JSON output (from an empty library) after fix has something for "id" field

lonelyjoe@lonelyjoe-desktop:~/workspace/empty_lib/src$ rustc lib.rs -Zast-json

{
   "module":{
      "inner":{
         "lo":0,
         "hi":94
      },
      "items":[
         {
            "attrs":[
               {
                  "kind":{
                     "variant":"Normal",
                     "fields":[
                        {
                           "path":{
                              "span":{
                                 "lo":0,
                                 "hi":0
                              },
                              "segments":[
                                 {
                                    "ident":{
                                       "name":"prelude_import",
                                       "span":{
                                          "lo":0,
                                          "hi":0
                                       }
                                    },
                                    "id":3,
                                    "args":null
                                 }
                              ]
                           },
                           "args":"Empty"
                        }
                     ]
                  },
                  "id":null,
                  "style":"Outer",
                  "span":{
                     "lo":0,
                     "hi":0
                  }
               }
            ],
            "id":4,
            "span":{
               "lo":0,
               "hi":0
            },
            "vis":{
               "node":"Inherited",
               "span":{
                  "lo":0,
                  "hi":0
               }
            },
            "ident":{
               "name":"",
               "span":{
                  "lo":0,
                  "hi":0
               }
            },
            "kind":{
               "variant":"Use",
               "fields":[
                  {
                     "prefix":{
                        "span":{
                           "lo":0,
                           "hi":0
                        },
                        "segments":[
                           {
                              "ident":{
                                 "name":"{{root}}",
                                 "span":{
                                    "lo":0,
                                    "hi":0
                                 }
                              },
                              "id":5,
                              "args":null
                           },
                           {
                              "ident":{
                                 "name":"std",
                                 "span":{
                                    "lo":0,
                                    "hi":0
                                 }
                              },
                              "id":6,
                              "args":null
                           },
                           {
                              "ident":{
                                 "name":"prelude",
                                 "span":{
                                    "lo":0,
                                    "hi":0
                                 }
                              },
                              "id":7,
                              "args":null
                           },
                           {
                              "ident":{
                                 "name":"v1",
                                 "span":{
                                    "lo":0,
                                    "hi":0
                                 }
                              },
                              "id":8,
                              "args":null
                           }
                        ]
                     },
                     "kind":"Glob",
                     "span":{
                        "lo":0,
                        "hi":0
                     }
                  }
               ]
            },
            "tokens":null
         },
         {
            "attrs":[
               {
                  "kind":{
                     "variant":"Normal",
                     "fields":[
                        {
                           "path":{
                              "span":{
                                 "lo":0,
                                 "hi":0
                              },
                              "segments":[
                                 {
                                    "ident":{
                                       "name":"macro_use",
                                       "span":{
                                          "lo":0,
                                          "hi":0
                                       }
                                    },
                                    "id":9,
                                    "args":null
                                 }
                              ]
                           },
                           "args":"Empty"
                        }
                     ]
                  },
                  "id":null,
                  "style":"Outer",
                  "span":{
                     "lo":0,
                     "hi":0
                  }
               }
            ],
            "id":10,
            "span":{
               "lo":0,
               "hi":0
            },
            "vis":{
               "node":"Inherited",
               "span":{
                  "lo":0,
                  "hi":0
               }
            },
            "ident":{
               "name":"std",
               "span":{
                  "lo":0,
                  "hi":0
               }
            },
            "kind":{
               "variant":"ExternCrate",
               "fields":[
                  null
               ]
            },
            "tokens":null
         }
      ],
      "inline":true
   },
   "attrs":[

   ],
   "span":{
      "lo":0,
      "hi":94
   },
   "proc_macros":[

   ]
}

rust-highfive · 2020-04-18T13:34:29Z

r? @estebank

(rust_highfive has picked a reviewer for you, use r? to override)

JOE1994 · 2020-04-18T13:34:53Z

r? @petrochenkov

petrochenkov · 2020-04-18T16:06:22Z

@JOE1994
Could you revert the change to Decodable as well to keep encoding and decoding symmetric?
(Decoding is probably not used for json specifically, but anyway.)

petrochenkov · 2020-04-18T16:11:59Z

There's a test src\test\ui\ast-json\ast-json-output.rs using -Z ast-json.
Could you add an attribute to it so the output contains "id":null?

JOE1994 · 2020-04-19T16:15:48Z

There's a test src\test\ui\ast-json\ast-json-output.rs using -Z ast-json.
Could you add an attribute to it so the output contains "id":null?

Thank you for your feedback! 👍 It seems that src/test/ui/ast-json/ast-json-output.rs only tests the stdout of -Z ast-json-noexpand and not -Z ast-json. The test was successful regardless of the changes made in this PR.

Below is what I thought I might have to do here (not yet committed):

Rename the following files

src/test/ui/ast-json/ast-json-output.rs -> src/test/ui/ast-json/ast-json-noexpand.rs
src/test/ui/ast-json/ast-json-output.stdout -> src/test/ui/ast-json/ast-json-noexpand.stdout

Create new test files (to test output of -Z ast-json)

src/test/ui/ast-json/ast-json-output.rs
src/test/ui/ast-json/ast-json-output.stdout

May I ask how I can add an attribute to allow the test to contain "id:null"?
It seems that the current test simply compares the stdout with the provided existing file (src/test/ui/ast-json/ast-json.stdout).

JOE1994 · 2020-04-19T16:19:20Z

I referred to the rustc-guide secion on rustc tests but couldn't find info on adding attributes to tests 😿

petrochenkov · 2020-04-19T16:37:19Z

@JOE1994
I think any attribute will work, e.g. #[inline] on the main function.

Having separate tests for -Z ast-json and -Z ast-json-noexpand would be nice.

petrochenkov · 2020-04-20T07:50:18Z

Thanks!
@bors r+

bors · 2020-04-20T07:50:20Z

📌 Commit b469d2d has been approved by petrochenkov

fix -Zast-json to output correct JSON form fixes rust-lang#71086 (Reverts some of the changes made in rust-lang#70215) JSON output (from an empty library) after fix has something for **"id"** field ```shell lonelyjoe@lonelyjoe-desktop:~/workspace/empty_lib/src$ rustc lib.rs -Zast-json ``` ```json { "module":{ "inner":{ "lo":0, "hi":94 }, "items":[ { "attrs":[ { "kind":{ "variant":"Normal", "fields":[ { "path":{ "span":{ "lo":0, "hi":0 }, "segments":[ { "ident":{ "name":"prelude_import", "span":{ "lo":0, "hi":0 } }, "id":3, "args":null } ] }, "args":"Empty" } ] }, "id":null, "style":"Outer", "span":{ "lo":0, "hi":0 } } ], "id":4, "span":{ "lo":0, "hi":0 }, "vis":{ "node":"Inherited", "span":{ "lo":0, "hi":0 } }, "ident":{ "name":"", "span":{ "lo":0, "hi":0 } }, "kind":{ "variant":"Use", "fields":[ { "prefix":{ "span":{ "lo":0, "hi":0 }, "segments":[ { "ident":{ "name":"{{root}}", "span":{ "lo":0, "hi":0 } }, "id":5, "args":null }, { "ident":{ "name":"std", "span":{ "lo":0, "hi":0 } }, "id":6, "args":null }, { "ident":{ "name":"prelude", "span":{ "lo":0, "hi":0 } }, "id":7, "args":null }, { "ident":{ "name":"v1", "span":{ "lo":0, "hi":0 } }, "id":8, "args":null } ] }, "kind":"Glob", "span":{ "lo":0, "hi":0 } } ] }, "tokens":null }, { "attrs":[ { "kind":{ "variant":"Normal", "fields":[ { "path":{ "span":{ "lo":0, "hi":0 }, "segments":[ { "ident":{ "name":"macro_use", "span":{ "lo":0, "hi":0 } }, "id":9, "args":null } ] }, "args":"Empty" } ] }, "id":null, "style":"Outer", "span":{ "lo":0, "hi":0 } } ], "id":10, "span":{ "lo":0, "hi":0 }, "vis":{ "node":"Inherited", "span":{ "lo":0, "hi":0 } }, "ident":{ "name":"std", "span":{ "lo":0, "hi":0 } }, "kind":{ "variant":"ExternCrate", "fields":[ null ] }, "tokens":null } ], "inline":true }, "attrs":[ ], "span":{ "lo":0, "hi":94 }, "proc_macros":[ ] } ```

@ghost

Rollup of 5 pull requests Successful merges: - rust-lang#71250 (Replace big JS dict with JSON parsing) - rust-lang#71270 (Fix `has_no_input_arg` check and rename it to `has_only_self_parameter`) - rust-lang#71284 (fix -Zast-json to output correct JSON form) - rust-lang#71328 (Stabilize PathBuf capacity methods) - rust-lang#71334 (Update pattern docs.) Failed merges: r? @ghost

fix -Zast-json to properly output the 'id' field

3211b83

rust-highfive assigned estebank Apr 18, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 18, 2020

rust-highfive assigned petrochenkov and unassigned estebank Apr 18, 2020

petrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 18, 2020

fix decode logic for 'AttrId' to be symmetric with encode logic

928eedb

check '-Zast-json' & '-Zast-json-noexpand' to output legal JSON

b469d2d

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 20, 2020

Dylan-DPC-zz mentioned this pull request Apr 20, 2020

Rollup of 4 pull requests #71351

Closed

Dylan-DPC-zz mentioned this pull request Apr 20, 2020

Rollup of 4 pull requests #71352

Closed

Dylan-DPC-zz mentioned this pull request Apr 20, 2020

Rollup of 5 pull requests #71356

Merged

bors merged commit 314b78c into rust-lang:master Apr 20, 2020

JOE1994 deleted the serialize_id branch June 21, 2020 16:59

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

fix -Zast-json to output correct JSON form #71284

fix -Zast-json to output correct JSON form #71284

Uh oh!

JOE1994 commented Apr 18, 2020

Uh oh!

rust-highfive commented Apr 18, 2020

Uh oh!

JOE1994 commented Apr 18, 2020

Uh oh!

petrochenkov commented Apr 18, 2020

Uh oh!

petrochenkov commented Apr 18, 2020

Uh oh!

JOE1994 commented Apr 19, 2020 •

edited

Loading

Uh oh!

JOE1994 commented Apr 19, 2020

Uh oh!

petrochenkov commented Apr 19, 2020

Uh oh!

petrochenkov commented Apr 20, 2020

Uh oh!

bors commented Apr 20, 2020

Uh oh!

Uh oh!

fix -Zast-json to output correct JSON form #71284

fix -Zast-json to output correct JSON form #71284

Uh oh!

Conversation

JOE1994 commented Apr 18, 2020

Uh oh!

rust-highfive commented Apr 18, 2020

Uh oh!

JOE1994 commented Apr 18, 2020

Uh oh!

petrochenkov commented Apr 18, 2020

Uh oh!

petrochenkov commented Apr 18, 2020

Uh oh!

JOE1994 commented Apr 19, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

JOE1994 commented Apr 19, 2020

Uh oh!

petrochenkov commented Apr 19, 2020

Uh oh!

petrochenkov commented Apr 20, 2020

Uh oh!

bors commented Apr 20, 2020

Uh oh!

Uh oh!

JOE1994 commented Apr 19, 2020 •

edited

Loading