From ed2602639bb15ef432509902afd51bd68936cc60 Mon Sep 17 00:00:00 2001 From: Alona Enraght-Moony Date: Mon, 6 Mar 2023 13:23:44 +0000 Subject: [PATCH] update.sh: Expect `FxHashMap` to come from `rustc_hash`, not `rustc_data_structures` https://github.com/rust-lang/rust/pull/108626 --- COMMIT.txt | 2 +- src/lib.rs | 7 +++---- update.sh | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/COMMIT.txt b/COMMIT.txt index 84f9431..484565a 100644 --- a/COMMIT.txt +++ b/COMMIT.txt @@ -1 +1 @@ -cca5d219e6801ebc2a62b455a12c657098a8af2d +52c71e6e2802a50d34ac4a3e96fc2636a3023eb2 diff --git a/src/lib.rs b/src/lib.rs index 387d578..6ec3c3a 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -4,9 +4,8 @@ //! struct is the root of the JSON blob and all other items are contained within. use std::collections::HashMap; -use std::path::PathBuf; - use serde::{Deserialize, Serialize}; +use std::path::PathBuf; /// rustdoc format-version. pub const FORMAT_VERSION: u32 = 24; @@ -54,8 +53,8 @@ pub struct ItemSummary { /// /// Note that items can appear in multiple paths, and the one chosen is implementation /// defined. Currently, this is the full path to where the item was defined. Eg - /// [`String`] is currently `["alloc", "string", "String"]` and [`HashMap`] is - /// `["std", "collections", "hash", "map", "HashMap"]`, but this is subject to change. + /// [`String`] is currently `["alloc", "string", "String"]` and [`HashMap`][`std::collections::HashMap`] + /// is `["std", "collections", "hash", "map", "HashMap"]`, but this is subject to change. pub path: Vec, /// Whether this item is a struct, trait, macro, etc. pub kind: ItemKind, diff --git a/update.sh b/update.sh index 5437494..859b377 100755 --- a/update.sh +++ b/update.sh @@ -8,7 +8,7 @@ user="rust-lang" repo="rust" branch="master" -curl -# https://raw.githubusercontent.com/${user}/${repo}/${branch}/src/rustdoc-json-types/lib.rs | sed 's/rustc_data_structures::fx::/std::collections::/g' | sed 's/FxHashMap/HashMap/g' > src/lib.rs +curl -# https://raw.githubusercontent.com/${user}/${repo}/${branch}/src/rustdoc-json-types/lib.rs | sed 's/rustc_hash::/std::collections::/g' | sed 's/FxHashMap/HashMap/g' > src/lib.rs curl -# https://raw.githubusercontent.com/${user}/${repo}/${branch}/src/rustdoc-json-types/tests.rs > src/tests.rs