Use same FxHashMap in rustdoc-json-types and librustdoc.

[aDotInTheVoid]

The original motivation was me trying to remove the #![allow(rustc::default_hash_types)], as after #108626, we should be using FxHashMap here. I then realized I should also be able to remove the .into_iter().collect(), as we no longer need to convert from FxHashMap to std::HashMap.

However, this didn't work, and I got the following error

error[E0308]: mismatched types
   --> src/librustdoc/json/mod.rs:235:13
    |
235 |             index,
    |             ^^^^^ expected `rustc_hash::FxHasher`, found `FxHasher`
    |
    = note: `FxHasher` and `rustc_hash::FxHasher` have similar names, but are actually distinct types
note: `FxHasher` is defined in crate `rustc_hash`
   --> /cargo/registry/src/index.crates.io-6f17d22bba15001f/rustc-hash-1.1.0/src/lib.rs:60:1
note: `rustc_hash::FxHasher` is defined in crate `rustc_hash`
   --> /home/alona/.cargo/registry/src/index.crates.io-6f17d22bba15001f/rustc-hash-1.1.0/src/lib.rs:60:1
    |
60  | pub struct FxHasher {
    | ^^^^^^^^^^^^^^^^^^^
    = note: perhaps two different versions of crate `rustc_hash` are being used?

This is because librustdoc got it's FxHashMap via the sysroot rustc-data-strucures, whereas rustdoc-json-types got it via rustc-hash on crates.io.

To avoid this, rustdoc-json-types now uses
#![feature(rustc_private)] to load the same version as librustdoc.

However, this needs to be placed behind a feature, as rustdoc-json-types is also dependency of src/tools/jsondocck, which means need needs to be buildable without nightly features.

r? @jyn514

[rustbot]

rustdoc-json-types is a public (although nightly-only) API. If possible, consider changing src/librustdoc/json/conversions.rs; otherwise, make sure you bump the FORMAT_VERSION constant.

cc @CraftSpider, @aDotInTheVoid, @Enselic, @obi1kenobi

These commits modify the Cargo.lock file. Random changes to Cargo.lock can be introduced when switching branches and rebasing PRs.
This was probably unintentional and should be reverted before this PR is merged.

If this was intentional then you can ignore this comment.

[jyn514]

However, this needs to be placed behind a feature, as rustdoc-json-types is also dependency of src/tools/jsondocck, which means need needs to be buildable without nightly features.

Hmm, I thought the motivation was that you want to be able to auto publish rustdoc-json-types to crates.io so people can use it? Is jsondocck built with the beta compiler or something like that?

[jyn514]

👍 this looks good, thanks! r=me when CI passes

[aDotInTheVoid]

Is jsondocck built with the beta compiler or something like that?

Yeah, tools arn't allowed to use nightly features (Not sure if build with beta, but it's enforced with allowed-features). Trying to use rustc_private when build for jsondoclint looks like

Building tool jsondoclint (stage0)
   Compiling libc v0.2.140
   Compiling io-lifetimes v1.0.3
   Compiling rustix v0.36.5
   Compiling bitflags v1.3.2
   Compiling linux-raw-sys v0.1.4
   Compiling utf8parse v0.2.1
   Compiling anstyle v0.3.5
   Compiling concolor-query v0.3.3
   Compiling concolor-override v1.0.0
   Compiling heck v0.4.0
   Compiling syn v2.0.8
   Compiling serde_json v1.0.85
   Compiling anyhow v1.0.65
   Compiling anstyle-parse v0.1.1
   Compiling strsim v0.10.0
   Compiling clap_lex v0.4.1
   Compiling rustdoc-json-types v0.1.0 (/home/alona/dev/rust/rust/src/rustdoc-json-types)
error[E0725]: the feature `rustc_private` is not in the list of allowed features
 --> src/rustdoc-json-types/lib.rs:6:12
  |
6 | #![feature(rustc_private)]
  |            ^^^^^^^^^^^^^

error[E0463]: can't find crate for `rustc_hash`
 --> src/rustdoc-json-types/lib.rs:7:1
  |
7 | extern crate rustc_hash;
  | ^^^^^^^^^^^^^^^^^^^^^^^^ can't find crate
  |
  = help: maybe you need to install the missing components with: `rustup component add rust-src rustc-dev llvm-tools-preview`

   Compiling rustc-hash v1.1.0

Hmm, I thought the motivation was that you want to be able to auto publish rustdoc-json-types to crates.io so people can use it?

I already do this (but not automaticly, and not in an official capacity) with aDotInTheVoid/rustdoc-types. This happens to make that slightly simpler, but wasn't the motivation (aDotInTheVoid/rustdoc-types#22)

[jyn514]

Building tool jsondoclint (stage0)

This bit means it's built with beta :)

@bors r+ rollup

[bors]

📌 Commit 12ad0d6 has been approved by jyn514

It is now in the queue for this repository.

[Noratrieb]

#110073 (comment)

@bors r-

[aDotInTheVoid]

Running ./x dist with profile = "compiler", I can't reproduce the issue locally after rebasing.

@bors try

[bors]

⌛ Trying commit 1410337 with merge 45fa4ef132fa25eaff3a9b6d127746c25f1c7e4d...

[bors]

☀️ Try build successful - checks-actions
Build commit: 45fa4ef132fa25eaff3a9b6d127746c25f1c7e4d (45fa4ef132fa25eaff3a9b6d127746c25f1c7e4d)

[aDotInTheVoid]

@bors r=jyn514

[bors]

📌 Commit 1410337 has been approved by jyn514

It is now in the queue for this repository.

[bors]

⌛ Testing commit 1410337 with merge e56d2f3fdfca65541fab42024effb381d393ebf2...

[aDotInTheVoid]

@rustbot author

[aDotInTheVoid]

@bors try

[aDotInTheVoid]

@bors ping

[aDotInTheVoid]

@bors ping

[aDotInTheVoid]

@bors ping

[pietroalbini]

@bors ping

[bors]

😪 I'm awake I'm awake

[Noratrieb]

uh, this is marked as pending, blocking CI from making progress.