mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #123584 - tgross35:rustc_doc_primitive-usage-error, r=fmease

Browse Source 
Emit an error when `rustc_doc_primitive` has an unknown value

Currently rustdoc silently does nothing. Change this to raise an error instead.
This commit is contained in:
Matthias Krüger 2024-04-07 14:49:59 +02:00 committed by GitHub
commit f64e97100c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/librustdoc/clean/types.rs
View File

@ -23,6 +23,7 @@
use rustc_hir_analysis::check::intrinsic::intrinsic_operation_unsafety; use rustc_hir_analysis::check::intrinsic::intrinsic_operation_unsafety;
use rustc_index::IndexVec; use rustc_index::IndexVec;
use rustc_metadata::rendered_const; use rustc_metadata::rendered_const;
use rustc_middle::span_bug;
use rustc_middle::ty::fast_reject::SimplifiedType; use rustc_middle::ty::fast_reject::SimplifiedType;
use rustc_middle::ty::{self, TyCtxt, Visibility}; use rustc_middle::ty::{self, TyCtxt, Visibility};
use rustc_resolve::rustdoc::{ use rustc_resolve::rustdoc::{
@ -266,8 +267,15 @@ pub(crate) fn primitives(&self, tcx: TyCtxt<'_>) -> ThinVec<(DefId, PrimitiveTyp
let as_primitive = |res: Res<!>| { let as_primitive = |res: Res<!>| {
let Res::Def(DefKind::Mod, def_id) = res else { return None }; let Res::Def(DefKind::Mod, def_id) = res else { return None };
tcx.get_attrs(def_id, sym::rustc_doc_primitive).find_map(|attr| { tcx.get_attrs(def_id, sym::rustc_doc_primitive).find_map(|attr| {
// FIXME: should warn on unknown primitives? let attr_value = attr.value_str().expect("syntax should already be validated");
Some((def_id, PrimitiveType::from_symbol(attr.value_str()?)?)) let Some(prim) = PrimitiveType::from_symbol(attr_value) else {
span_bug!(
attr.span,
"primitive `{attr_value}` is not a member of `PrimitiveType`"
);
};
Some((def_id, prim))
}) })
}; };