Skip to content

Commit beab2e9

Browse files
borsbors
committed
Auto merge of rust-lang#116601 - matthiaskrgr:rollup-wwzqj8y, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - rust-lang#109422 (rustdoc-search: add impl disambiguator to duplicate assoc items) - rust-lang#115948 (rustdoc: show crate name beside smaller logo) - rust-lang#116444 (add test for const-eval error in dead code during monomorphization) - rust-lang#116503 (Update docs for mips target tier demotion.) - rust-lang#116559 (Mark `new_in` as `const` for BTree collections) - rust-lang#116560 (In smir use `FxIndexMap` to store indexed ids) - rust-lang#116574 (Update books) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 5b88d65 + ed2b50d commit beab2e9

File tree

96 files changed

+912
-203
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+912
-203
lines changed

‎Cargo.lock

+1
Original file line numberDiff line numberDiff line change
@@ -4504,6 +4504,7 @@ dependencies = [
45044504
name = "rustc_smir"
45054505
version = "0.0.0"
45064506
dependencies = [
4507+
"rustc_data_structures",
45074508
"rustc_driver",
45084509
"rustc_hir",
45094510
"rustc_interface",

‎RELEASES.md

+1
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,7 @@ Compatibility Notes
229229
this should only impact users of other registries, or people who don't publish
230230
to a registry.
231231
[#12291](https://github.com/rust-lang/cargo/pull/12291)
232+
- [Demoted `mips*-unknown-linux-gnu*` targets from host tier 2 to target tier 3 support.](https://github.com/rust-lang/rust/pull/113274)
232233

233234
Version 1.71.1 (2023-08-03)
234235
===========================

‎compiler/rustc_arena/src/lib.rs

+2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/",
1212
test(no_crate_inject, attr(deny(warnings)))
1313
)]
14+
#![cfg_attr(not(bootstrap), doc(rust_logo))]
15+
#![cfg_attr(not(bootstrap), feature(rustdoc_internals))]
1416
#![feature(core_intrinsics)]
1517
#![feature(dropck_eyepatch)]
1618
#![feature(new_uninit)]

‎compiler/rustc_ast/src/lib.rs

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/",
99
test(attr(deny(warnings)))
1010
)]
11+
#![cfg_attr(not(bootstrap), doc(rust_logo))]
12+
#![cfg_attr(not(bootstrap), allow(internal_features))]
13+
#![cfg_attr(not(bootstrap), feature(rustdoc_internals))]
1114
#![feature(associated_type_bounds)]
1215
#![feature(box_patterns)]
1316
#![feature(const_trait_impl)]

‎compiler/rustc_codegen_ssa/src/lib.rs

+3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
2+
#![cfg_attr(not(bootstrap), doc(rust_logo))]
3+
#![cfg_attr(not(bootstrap), feature(rustdoc_internals))]
4+
#![cfg_attr(not(bootstrap), allow(internal_features))]
25
#![feature(associated_type_bounds)]
36
#![feature(box_patterns)]
47
#![feature(if_let_guard)]

‎compiler/rustc_driver_impl/src/lib.rs

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
//! This API is completely unstable and subject to change.
66
77
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
8+
#![cfg_attr(not(bootstrap), doc(rust_logo))]
9+
#![cfg_attr(not(bootstrap), feature(rustdoc_internals))]
10+
#![cfg_attr(not(bootstrap), allow(internal_features))]
811
#![feature(lazy_cell)]
912
#![feature(decl_macro)]
1013
#![feature(panic_update_hook)]

‎compiler/rustc_errors/src/lib.rs

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
//! This module contains the code for creating and emitting diagnostics.
44
55
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
6+
#![cfg_attr(not(bootstrap), doc(rust_logo))]
7+
#![cfg_attr(not(bootstrap), feature(rustdoc_internals))]
68
#![feature(array_windows)]
79
#![feature(extract_if)]
810
#![feature(if_let_guard)]

‎compiler/rustc_fluent_macro/src/lib.rs

+3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
2+
#![cfg_attr(not(bootstrap), doc(rust_logo))]
3+
#![cfg_attr(not(bootstrap), allow(internal_features))]
4+
#![cfg_attr(not(bootstrap), feature(rustdoc_internals))]
25
#![feature(proc_macro_diagnostic)]
36
#![feature(proc_macro_span)]
47
#![deny(rustc::untranslatable_diagnostic)]

‎compiler/rustc_graphviz/src/lib.rs

+3
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,9 @@
273273
html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/",
274274
test(attr(allow(unused_variables), deny(warnings)))
275275
)]
276+
#![cfg_attr(not(bootstrap), feature(rustdoc_internals))]
277+
#![cfg_attr(not(bootstrap), doc(rust_logo))]
278+
#![cfg_attr(not(bootstrap), allow(internal_features))]
276279
#![deny(rustc::untranslatable_diagnostic)]
277280
#![deny(rustc::diagnostic_outside_of_impl)]
278281

‎compiler/rustc_hir_analysis/src/lib.rs

+3
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,9 @@ This API is completely unstable and subject to change.
5757

5858
#![allow(rustc::potential_query_instability)]
5959
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
60+
#![cfg_attr(not(bootstrap), doc(rust_logo))]
61+
#![cfg_attr(not(bootstrap), feature(rustdoc_internals))]
62+
#![cfg_attr(not(bootstrap), allow(internal_features))]
6063
#![feature(box_patterns)]
6164
#![feature(control_flow_enum)]
6265
#![feature(if_let_guard)]

‎compiler/rustc_incremental/src/lib.rs

+3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
33
#![deny(missing_docs)]
44
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
5+
#![cfg_attr(not(bootstrap), doc(rust_logo))]
6+
#![cfg_attr(not(bootstrap), feature(rustdoc_internals))]
7+
#![cfg_attr(not(bootstrap), allow(internal_features))]
58
#![feature(never_type)]
69
#![recursion_limit = "256"]
710
#![deny(rustc::untranslatable_diagnostic)]

‎compiler/rustc_infer/src/lib.rs

+3
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
//! This API is completely unstable and subject to change.
1414
1515
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
16+
#![cfg_attr(not(bootstrap), doc(rust_logo))]
17+
#![cfg_attr(not(bootstrap), feature(rustdoc_internals))]
18+
#![cfg_attr(not(bootstrap), allow(internal_features))]
1619
#![feature(associated_type_bounds)]
1720
#![feature(box_patterns)]
1821
#![feature(control_flow_enum)]

‎compiler/rustc_lint/src/lib.rs

+2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
2828
#![allow(rustc::potential_query_instability)]
2929
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
30+
#![cfg_attr(not(bootstrap), doc(rust_logo))]
31+
#![cfg_attr(not(bootstrap), feature(rustdoc_internals))]
3032
#![feature(array_windows)]
3133
#![feature(box_patterns)]
3234
#![feature(control_flow_enum)]

‎compiler/rustc_llvm/src/lib.rs

+3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
#![deny(rustc::untranslatable_diagnostic)]
22
#![deny(rustc::diagnostic_outside_of_impl)]
33
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
4+
#![cfg_attr(not(bootstrap), doc(rust_logo))]
5+
#![cfg_attr(not(bootstrap), feature(rustdoc_internals))]
6+
#![cfg_attr(not(bootstrap), allow(internal_features))]
47

58
// NOTE: This crate only exists to allow linking on mingw targets.
69

‎compiler/rustc_metadata/src/lib.rs

+3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
2+
#![cfg_attr(not(bootstrap), doc(rust_logo))]
3+
#![cfg_attr(not(bootstrap), feature(rustdoc_internals))]
4+
#![cfg_attr(not(bootstrap), allow(internal_features))]
25
#![feature(decl_macro)]
36
#![feature(extract_if)]
47
#![feature(generators)]

‎compiler/rustc_middle/src/lib.rs

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
//! This API is completely unstable and subject to change.
2424
2525
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
26+
#![cfg_attr(not(bootstrap), doc(rust_logo))]
27+
#![cfg_attr(not(bootstrap), feature(rustdoc_internals))]
2628
#![feature(allocator_api)]
2729
#![feature(array_windows)]
2830
#![feature(assert_matches)]

‎compiler/rustc_parse_format/src/lib.rs

+3
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
html_playground_url = "https://play.rust-lang.org/",
1010
test(attr(deny(warnings)))
1111
)]
12+
#![cfg_attr(not(bootstrap), doc(rust_logo))]
13+
#![cfg_attr(not(bootstrap), allow(internal_features))]
14+
#![cfg_attr(not(bootstrap), feature(rustdoc_internals))]
1215
#![deny(rustc::untranslatable_diagnostic)]
1316
#![deny(rustc::diagnostic_outside_of_impl)]
1417
// We want to be able to build this crate with a stable compiler, so no

‎compiler/rustc_passes/src/check_attr.rs

+13
Original file line numberDiff line numberDiff line change
@@ -1108,6 +1108,7 @@ impl CheckAttrVisitor<'_> {
11081108
| sym::html_root_url
11091109
| sym::html_no_source
11101110
| sym::test
1111+
| sym::rust_logo
11111112
if !self.check_attr_crate_level(attr, meta, hir_id) =>
11121113
{
11131114
is_valid = false;
@@ -1166,6 +1167,18 @@ impl CheckAttrVisitor<'_> {
11661167
| sym::plugins
11671168
| sym::fake_variadic => {}
11681169

1170+
sym::rust_logo => {
1171+
if !self.tcx.features().rustdoc_internals {
1172+
feature_err(
1173+
&self.tcx.sess.parse_sess,
1174+
sym::rustdoc_internals,
1175+
meta.span(),
1176+
"the `#[doc(rust_logo)]` attribute is used for Rust branding",
1177+
)
1178+
.emit();
1179+
}
1180+
}
1181+
11691182
sym::test => {
11701183
if !self.check_test_attr(meta, hir_id) {
11711184
is_valid = false;

‎compiler/rustc_passes/src/lib.rs

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
77
#![allow(rustc::potential_query_instability)]
88
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
9+
#![cfg_attr(not(bootstrap), doc(rust_logo))]
10+
#![cfg_attr(not(bootstrap), feature(rustdoc_internals))]
11+
#![cfg_attr(not(bootstrap), allow(internal_features))]
912
#![feature(iter_intersperse)]
1013
#![feature(let_chains)]
1114
#![feature(map_try_insert)]

‎compiler/rustc_plugin_impl/src/lib.rs

+3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
//! of the Unstable Book for some examples.
88
99
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
10+
#![cfg_attr(not(bootstrap), doc(rust_logo))]
11+
#![cfg_attr(not(bootstrap), feature(rustdoc_internals))]
12+
#![cfg_attr(not(bootstrap), allow(internal_features))]
1013
#![recursion_limit = "256"]
1114
#![deny(rustc::untranslatable_diagnostic)]
1215
#![deny(rustc::diagnostic_outside_of_impl)]

‎compiler/rustc_privacy/src/lib.rs

+3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
2+
#![cfg_attr(not(bootstrap), doc(rust_logo))]
3+
#![cfg_attr(not(bootstrap), feature(rustdoc_internals))]
4+
#![cfg_attr(not(bootstrap), allow(internal_features))]
25
#![feature(associated_type_defaults)]
36
#![feature(rustc_private)]
47
#![feature(try_blocks)]

‎compiler/rustc_query_impl/src/lib.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
//! Support for serializing the dep-graph and reloading it.
22
33
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
4+
#![cfg_attr(not(bootstrap), doc(rust_logo))]
5+
#![cfg_attr(not(bootstrap), feature(rustdoc_internals))]
46
// this shouldn't be necessary, but the check for `&mut _` is too naive and denies returning a function pointer that takes a mut ref
57
#![feature(const_mut_refs)]
68
#![feature(const_refs_to_cell)]

‎compiler/rustc_resolve/src/lib.rs

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
//! Type-relative name resolution (methods, fields, associated items) happens in `rustc_hir_analysis`.
88
99
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
10+
#![cfg_attr(not(bootstrap), doc(rust_logo))]
11+
#![cfg_attr(not(bootstrap), feature(rustdoc_internals))]
1012
#![feature(assert_matches)]
1113
#![feature(box_patterns)]
1214
#![feature(extract_if)]

‎compiler/rustc_serialize/src/lib.rs

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
html_playground_url = "https://play.rust-lang.org/",
66
test(attr(allow(unused_variables), deny(warnings)))
77
)]
8+
#![cfg_attr(not(bootstrap), doc(rust_logo))]
9+
#![cfg_attr(not(bootstrap), allow(internal_features))]
10+
#![cfg_attr(not(bootstrap), feature(rustdoc_internals))]
811
#![feature(allocator_api)]
912
#![feature(associated_type_bounds)]
1013
#![feature(const_option)]

‎compiler/rustc_smir/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ version = "0.0.0"
44
edition = "2021"
55

66
[dependencies]
7+
rustc_data_structures = { path = "../rustc_data_structures" }
78
rustc_driver = { path = "../rustc_driver" }
89
rustc_hir = { path = "../rustc_hir" }
910
rustc_interface = { path = "../rustc_interface" }

‎compiler/rustc_smir/src/lib.rs

+3
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/",
1111
test(attr(allow(unused_variables), deny(warnings)))
1212
)]
13+
#![cfg_attr(not(bootstrap), doc(rust_logo))]
14+
#![cfg_attr(not(bootstrap), feature(rustdoc_internals))]
15+
#![cfg_attr(not(bootstrap), allow(internal_features))]
1316

1417
pub mod rustc_internal;
1518

‎compiler/rustc_smir/src/rustc_internal/mod.rs

+43-29
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,27 @@
33
//! For that, we define APIs that will temporarily be public to 3P that exposes rustc internal APIs
44
//! until stable MIR is complete.
55
6-
use std::ops::{ControlFlow, Index};
7-
86
use crate::rustc_internal;
97
use crate::rustc_smir::Tables;
8+
use rustc_data_structures::fx;
109
use rustc_driver::{Callbacks, Compilation, RunCompiler};
1110
use rustc_interface::{interface, Queries};
1211
use rustc_middle::mir::interpret::AllocId;
1312
use rustc_middle::ty::TyCtxt;
1413
use rustc_span::def_id::{CrateNum, DefId};
1514
use rustc_span::Span;
15+
use stable_mir::ty::IndexedVal;
1616
use stable_mir::CompilerError;
17+
use std::fmt::Debug;
18+
use std::hash::Hash;
19+
use std::ops::{ControlFlow, Index};
1720

1821
impl<'tcx> Index<stable_mir::DefId> for Tables<'tcx> {
1922
type Output = DefId;
2023

2124
#[inline(always)]
2225
fn index(&self, index: stable_mir::DefId) -> &Self::Output {
23-
&self.def_ids[index.0]
26+
&self.def_ids[index]
2427
}
2528
}
2629

@@ -29,7 +32,7 @@ impl<'tcx> Index<stable_mir::ty::Span> for Tables<'tcx> {
2932

3033
#[inline(always)]
3134
fn index(&self, index: stable_mir::ty::Span) -> &Self::Output {
32-
&self.spans[index.0]
35+
&self.spans[index]
3336
}
3437
}
3538

@@ -95,36 +98,15 @@ impl<'tcx> Tables<'tcx> {
9598
}
9699

97100
fn create_def_id(&mut self, did: DefId) -> stable_mir::DefId {
98-
// FIXME: this becomes inefficient when we have too many ids
99-
for (i, &d) in self.def_ids.iter().enumerate() {
100-
if d == did {
101-
return stable_mir::DefId(i);
102-
}
103-
}
104-
let id = self.def_ids.len();
105-
self.def_ids.push(did);
106-
stable_mir::DefId(id)
101+
self.def_ids.create_or_fetch(did)
107102
}
108103

109104
fn create_alloc_id(&mut self, aid: AllocId) -> stable_mir::AllocId {
110-
// FIXME: this becomes inefficient when we have too many ids
111-
if let Some(i) = self.alloc_ids.iter().position(|a| *a == aid) {
112-
return stable_mir::AllocId(i);
113-
};
114-
let id = self.def_ids.len();
115-
self.alloc_ids.push(aid);
116-
stable_mir::AllocId(id)
105+
self.alloc_ids.create_or_fetch(aid)
117106
}
118107

119108
pub(crate) fn create_span(&mut self, span: Span) -> stable_mir::ty::Span {
120-
for (i, &sp) in self.spans.iter().enumerate() {
121-
if sp == span {
122-
return stable_mir::ty::Span(i);
123-
}
124-
}
125-
let id = self.spans.len();
126-
self.spans.push(span);
127-
stable_mir::ty::Span(id)
109+
self.spans.create_or_fetch(span)
128110
}
129111
}
130112

@@ -134,7 +116,13 @@ pub fn crate_num(item: &stable_mir::Crate) -> CrateNum {
134116

135117
pub fn run(tcx: TyCtxt<'_>, f: impl FnOnce()) {
136118
stable_mir::run(
137-
Tables { tcx, def_ids: vec![], alloc_ids: vec![], spans: vec![], types: vec![] },
119+
Tables {
120+
tcx,
121+
def_ids: rustc_internal::IndexMap { index_map: fx::FxIndexMap::default() },
122+
alloc_ids: rustc_internal::IndexMap { index_map: fx::FxIndexMap::default() },
123+
spans: rustc_internal::IndexMap { index_map: fx::FxIndexMap::default() },
124+
types: vec![],
125+
},
138126
f,
139127
);
140128
}
@@ -197,3 +185,29 @@ where
197185
})
198186
}
199187
}
188+
189+
/// Simmilar to rustc's `FxIndexMap`, `IndexMap` with extra
190+
/// safety features added.
191+
pub struct IndexMap<K, V> {
192+
index_map: fx::FxIndexMap<K, V>,
193+
}
194+
195+
impl<K: PartialEq + Hash + Eq, V: Copy + Debug + PartialEq + IndexedVal> IndexMap<K, V> {
196+
pub fn create_or_fetch(&mut self, key: K) -> V {
197+
let len = self.index_map.len();
198+
let v = self.index_map.entry(key).or_insert(V::to_val(len));
199+
*v
200+
}
201+
}
202+
203+
impl<K: PartialEq + Hash + Eq, V: Copy + Debug + PartialEq + IndexedVal> Index<V>
204+
for IndexMap<K, V>
205+
{
206+
type Output = K;
207+
208+
fn index(&self, index: V) -> &Self::Output {
209+
let (k, v) = self.index_map.get_index(index.to_index()).unwrap();
210+
assert_eq!(*v, index, "Provided value doesn't match with indexed value");
211+
k
212+
}
213+
}

0 commit comments

Comments
 (0)