
Currently we have an awkward mix of fallible and infallible functions: ``` new_parser_from_source_str maybe_new_parser_from_source_str new_parser_from_file (maybe_new_parser_from_file) // missing (new_parser_from_source_file) // missing maybe_new_parser_from_source_file source_str_to_stream maybe_source_file_to_stream ``` We could add the two missing functions, but instead this commit removes of all the infallible ones and renames the fallible ones leaving us with these which are all fallible: ``` new_parser_from_source_str new_parser_from_file new_parser_from_source_file source_str_to_stream source_file_to_stream ``` This requires making `unwrap_or_emit_fatal` public so callers of formerly infallible functions can still work. This does make some of the call sites slightly more verbose, but I think it's worth it for the simpler API. Also, there are two `catch_unwind` calls and one `catch_fatal_errors` call in this diff that become removable thanks this change. (I will do that in a follow-up PR.)
176 lines
6 KiB
Rust
176 lines
6 KiB
Rust
//! Validates syntax inside Rust code blocks (\`\`\`rust).
|
|
use rustc_data_structures::sync::{Lock, Lrc};
|
|
use rustc_errors::{
|
|
emitter::Emitter,
|
|
translation::{to_fluent_args, Translate},
|
|
Applicability, DiagCtxt, DiagInner, LazyFallbackBundle,
|
|
};
|
|
use rustc_parse::{source_str_to_stream, unwrap_or_emit_fatal};
|
|
use rustc_resolve::rustdoc::source_span_for_markdown_range;
|
|
use rustc_session::parse::ParseSess;
|
|
use rustc_span::hygiene::{AstPass, ExpnData, ExpnKind, LocalExpnId, Transparency};
|
|
use rustc_span::source_map::{FilePathMapping, SourceMap};
|
|
use rustc_span::{FileName, InnerSpan, DUMMY_SP};
|
|
|
|
use crate::clean;
|
|
use crate::core::DocContext;
|
|
use crate::html::markdown::{self, RustCodeBlock};
|
|
|
|
pub(crate) fn visit_item(cx: &DocContext<'_>, item: &clean::Item) {
|
|
if let Some(dox) = &item.opt_doc_value() {
|
|
let sp = item.attr_span(cx.tcx);
|
|
let extra = crate::html::markdown::ExtraInfo::new(cx.tcx, item.item_id.expect_def_id(), sp);
|
|
for code_block in markdown::rust_code_blocks(dox, &extra) {
|
|
check_rust_syntax(cx, item, dox, code_block);
|
|
}
|
|
}
|
|
}
|
|
|
|
fn check_rust_syntax(
|
|
cx: &DocContext<'_>,
|
|
item: &clean::Item,
|
|
dox: &str,
|
|
code_block: RustCodeBlock,
|
|
) {
|
|
let buffer = Lrc::new(Lock::new(Buffer::default()));
|
|
let fallback_bundle = rustc_errors::fallback_fluent_bundle(
|
|
rustc_driver::DEFAULT_LOCALE_RESOURCES.to_vec(),
|
|
false,
|
|
);
|
|
let emitter = BufferEmitter { buffer: Lrc::clone(&buffer), fallback_bundle };
|
|
|
|
let sm = Lrc::new(SourceMap::new(FilePathMapping::empty()));
|
|
let dcx = DiagCtxt::new(Box::new(emitter)).disable_warnings();
|
|
let source = dox[code_block.code].to_owned();
|
|
let psess = ParseSess::with_dcx(dcx, sm);
|
|
|
|
let edition = code_block.lang_string.edition.unwrap_or_else(|| cx.tcx.sess.edition());
|
|
let expn_data =
|
|
ExpnData::default(ExpnKind::AstPass(AstPass::TestHarness), DUMMY_SP, edition, None, None);
|
|
let expn_id = cx.tcx.with_stable_hashing_context(|hcx| LocalExpnId::fresh(expn_data, hcx));
|
|
let span = DUMMY_SP.apply_mark(expn_id.to_expn_id(), Transparency::Transparent);
|
|
|
|
let is_empty = rustc_driver::catch_fatal_errors(|| {
|
|
unwrap_or_emit_fatal(source_str_to_stream(
|
|
&psess,
|
|
FileName::Custom(String::from("doctest")),
|
|
source,
|
|
Some(span),
|
|
))
|
|
.is_empty()
|
|
})
|
|
.unwrap_or(false);
|
|
let buffer = buffer.borrow();
|
|
|
|
if !buffer.has_errors && !is_empty {
|
|
// No errors in a non-empty program.
|
|
return;
|
|
}
|
|
|
|
let Some(local_id) = item.item_id.as_def_id().and_then(|x| x.as_local()) else {
|
|
// We don't need to check the syntax for other crates so returning
|
|
// without doing anything should not be a problem.
|
|
return;
|
|
};
|
|
|
|
let empty_block = code_block.lang_string == Default::default() && code_block.is_fenced;
|
|
let is_ignore = code_block.lang_string.ignore != markdown::Ignore::None;
|
|
|
|
// The span and whether it is precise or not.
|
|
let (sp, precise_span) = match source_span_for_markdown_range(
|
|
cx.tcx,
|
|
dox,
|
|
&code_block.range,
|
|
&item.attrs.doc_strings,
|
|
) {
|
|
Some(sp) => (sp, true),
|
|
None => (item.attr_span(cx.tcx), false),
|
|
};
|
|
|
|
let msg = if buffer.has_errors {
|
|
"could not parse code block as Rust code"
|
|
} else {
|
|
"Rust code block is empty"
|
|
};
|
|
|
|
// Finally build and emit the completed diagnostic.
|
|
// All points of divergence have been handled earlier so this can be
|
|
// done the same way whether the span is precise or not.
|
|
let hir_id = cx.tcx.local_def_id_to_hir_id(local_id);
|
|
cx.tcx.node_span_lint(crate::lint::INVALID_RUST_CODEBLOCKS, hir_id, sp, |lint| {
|
|
lint.primary_message(msg);
|
|
|
|
let explanation = if is_ignore {
|
|
"`ignore` code blocks require valid Rust code for syntax highlighting; \
|
|
mark blocks that do not contain Rust code as text"
|
|
} else {
|
|
"mark blocks that do not contain Rust code as text"
|
|
};
|
|
|
|
if precise_span {
|
|
if is_ignore {
|
|
// giving an accurate suggestion is hard because `ignore` might not have come first in the list.
|
|
// just give a `help` instead.
|
|
lint.span_help(
|
|
sp.from_inner(InnerSpan::new(0, 3)),
|
|
format!("{explanation}: ```text"),
|
|
);
|
|
} else if empty_block {
|
|
lint.span_suggestion(
|
|
sp.from_inner(InnerSpan::new(0, 3)).shrink_to_hi(),
|
|
explanation,
|
|
"text",
|
|
Applicability::MachineApplicable,
|
|
);
|
|
}
|
|
} else if empty_block || is_ignore {
|
|
lint.help(format!("{explanation}: ```text"));
|
|
}
|
|
|
|
// FIXME(#67563): Provide more context for these errors by displaying the spans inline.
|
|
for message in buffer.messages.iter() {
|
|
lint.note(message.clone());
|
|
}
|
|
});
|
|
}
|
|
|
|
#[derive(Default)]
|
|
struct Buffer {
|
|
messages: Vec<String>,
|
|
has_errors: bool,
|
|
}
|
|
|
|
struct BufferEmitter {
|
|
buffer: Lrc<Lock<Buffer>>,
|
|
fallback_bundle: LazyFallbackBundle,
|
|
}
|
|
|
|
impl Translate for BufferEmitter {
|
|
fn fluent_bundle(&self) -> Option<&Lrc<rustc_errors::FluentBundle>> {
|
|
None
|
|
}
|
|
|
|
fn fallback_fluent_bundle(&self) -> &rustc_errors::FluentBundle {
|
|
&**self.fallback_bundle
|
|
}
|
|
}
|
|
|
|
impl Emitter for BufferEmitter {
|
|
fn emit_diagnostic(&mut self, diag: DiagInner) {
|
|
let mut buffer = self.buffer.borrow_mut();
|
|
|
|
let fluent_args = to_fluent_args(diag.args.iter());
|
|
let translated_main_message = self
|
|
.translate_message(&diag.messages[0].0, &fluent_args)
|
|
.unwrap_or_else(|e| panic!("{e}"));
|
|
|
|
buffer.messages.push(format!("error from rustc: {translated_main_message}"));
|
|
if diag.is_error() {
|
|
buffer.has_errors = true;
|
|
}
|
|
}
|
|
|
|
fn source_map(&self) -> Option<&Lrc<SourceMap>> {
|
|
None
|
|
}
|
|
}
|