Add abi field to Method

[CraftSpider]

Also bumps version and adds a test (Will conflict with #81500, whichever is merged first)

Rationale: It's possible for methods to have an ABI. This should be exposed in the JSON.

[rust-highfive]

r? @ollie27

(rust-highfive has picked a reviewer for you, use r? to override)

[CraftSpider]

@rustbot modify labels: +T-rustdoc +A-rustdoc-json

[jyn514]

LGTM, but this will conflict with the Union change.

[jyn514]

Maybe we should consider 'bundling' the changes together somehow so the version doesn't change as often? This isn't a breaking change either, it seems a shame - we could use 3.1 or something maybe?

[CraftSpider]

I mean, as it's non-breaking, I think it might be okay if there's a way to get them merged in the same nightly, or such? I guess I could just make a new branch with both of these and PR it, so they merge together

[bors]

☔ The latest upstream changes (presumably #81784) made this pull request unmergeable. Please resolve the merge conflicts.

[CraftSpider]

Rebased. Didn't update version number yet, as I'm not sure if we want to for a non-breaking change?

[rust-log-analyzer]

The job mingw-check failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

    Checking rustdoc v0.0.0 (/checkout/src/librustdoc)
error: expected identifier, found `<<`
   --> src/librustdoc/json/conversions.rs:437:1
    |
437 | <<<<<<< HEAD
    | ^^ expected identifier
error[E0432]: unresolved import `crate::json::conversions::from_def_id`
  --> src/librustdoc/json/mod.rs:27:5
   |
27 | use crate::json::conversions::from_def_id;
27 | use crate::json::conversions::from_def_id;
   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ no `from_def_id` in `json::conversions`

error[E0277]: the trait bound `rustdoc_json_types::Trait: From<types::Trait>` is not satisfied
   --> src/librustdoc/json/mod.rs:111:63
    |
111 | ...                   inner: types::ItemEnum::TraitItem(trait_item.clone().into()),
    |                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `From<types::Trait>` is not implemented for `rustdoc_json_types::Trait`
    |
    = note: required because of the requirements on the impl of `Into<rustdoc_json_types::Trait>` for `types::Trait`

error[E0599]: no method named `convert_item` found for mutable reference `&mut JsonRenderer<'tcx>` in the current scope
   --> src/librustdoc/json/mod.rs:160:42
    |
160 |         if let Some(mut new_item) = self.convert_item(item) {
    |                                          ^^^^^^^^^^^^ method not found in `&mut JsonRenderer<'tcx>`

error[E0277]: the trait bound `rustdoc_json_types::ItemKind: From<ItemType>` is not satisfied
   --> src/librustdoc/json/mod.rs:225:91
    |
225 |                         types::ItemSummary { crate_id: k.krate.as_u32(), path, kind: kind.into() },
    |                                                                                           ^^^^ the trait `From<ItemType>` is not implemented for `rustdoc_json_types::ItemKind`
    |
    = note: required because of the requirements on the impl of `Into<rustdoc_json_types::ItemKind>` for `ItemType`
error: aborting due to 5 previous errors

Some errors have detailed explanations: E0277, E0432, E0599.
For more information about an error, try `rustc --explain E0277`.

[jyn514]

rust-lang/rfcs#2963 (comment) says the main reason for a format-version is to avoid breaking changes, so I agree I don't think we need to bump it for a non-breaking change.

@bors r+

[bors]

📌 Commit ac75faf has been approved by jyn514

[bors]

⌛ Testing commit ac75faf with merge ae00b62...

[bors]

☀️ Test successful - checks-actions
Approved by: jyn514
Pushing ae00b62 to master...