diff options
| author | bors <bors@rust-lang.org> | 2024-05-16 14:32:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-05-16 14:32:49 +0000 |
| commit | 97bf25c8cf6c7c97c851c6e8bc94fd0824885e6f (patch) | |
| tree | 1da8eb44bdf2c6052067337da8d4a319a0bccd3d /src | |
| parent | 4a78c00e227124ff9d5ece2d493472e7325c87d3 (diff) | |
| parent | e3864db41885078418e06af845e863d4329eae26 (diff) | |
| download | rust-97bf25c8cf6c7c97c851c6e8bc94fd0824885e6f.tar.gz rust-97bf25c8cf6c7c97c851c6e8bc94fd0824885e6f.zip | |
Auto merge of #125179 - matthiaskrgr:rollup-wkdwoaj, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #124871 (Don't ICE because recomputing overflow goals during find_best_leaf_obligation causes inference side-effects) - #125018 (Update linker-plugin-lto.md to include LLVM 18) - #125130 (rustdoc-json-types: Document `Id`) - #125170 (Uplift `FnSig` into `rustc_type_ir` (redux)) - #125172 (Fix assertion when attempting to convert `f16` and `f128` with `as`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src')
| -rw-r--r-- | src/doc/rustc/src/linker-plugin-lto.md | 3 | ||||
| -rw-r--r-- | src/rustdoc-json-types/lib.rs | 14 |
2 files changed, 15 insertions, 2 deletions
diff --git a/src/doc/rustc/src/linker-plugin-lto.md b/src/doc/rustc/src/linker-plugin-lto.md index ff80f140482..ab95aa2e5a1 100644 --- a/src/doc/rustc/src/linker-plugin-lto.md +++ b/src/doc/rustc/src/linker-plugin-lto.md @@ -200,6 +200,7 @@ The following table shows known good combinations of toolchain versions. | 1.60 - 1.64 | 14 | | 1.65 - 1.69 | 15 | | 1.70 - 1.72 | 16 | -| 1.73 - 1.74 | 17 | +| 1.73 - 1.77 | 17 | +| 1.78 | 18 | Note that the compatibility policy for this feature might change in the future. diff --git a/src/rustdoc-json-types/lib.rs b/src/rustdoc-json-types/lib.rs index e788069ea80..1c5a6dcfb1f 100644 --- a/src/rustdoc-json-types/lib.rs +++ b/src/rustdoc-json-types/lib.rs @@ -188,7 +188,19 @@ pub enum TypeBindingKind { Constraint(Vec<GenericBound>), } -#[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] +/// An opaque identifier for an item. +/// +/// It can be used to lookup in [Crate::index] or [Crate::paths] to resolve it +/// to an [Item]. +/// +/// Id's are only valid within a single JSON blob. They cannot be used to +/// resolve references between the JSON output's for different crates. +/// +/// Rustdoc makes no guarantees about the inner value of Id's. Applications +/// should treat them as opaque keys to lookup items, and avoid attempting +/// to parse them, or otherwise depend on any implementation details. +#[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] +// FIXME(aDotInTheVoid): Consider making this non-public in rustdoc-types. pub struct Id(pub String); #[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] |
