user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #118086 - nnethercote:queries-cleanups, r=bjorn3

Browse source 
Queries cleanups

r? `@bjorn3`
This commit is contained in:
bors 2023-11-22 11:44:56 +00:00
commit a6b8ae582a
8 changed files with 47 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/librustdoc/doctest.rs
View file

@ -127,17 +127,17 @@ pub(crate) fn run(options: RustdocOptions) -> Result<(), ErrorGuaranteed> {
options,
false,
opts,
Some(compiler.session().parse_sess.clone_source_map()),
Some(compiler.sess.parse_sess.clone_source_map()),
None,
enable_per_target_ignores,
);
let mut hir_collector = HirCollector {
sess: compiler.session(),
sess: &compiler.sess,
collector: &mut collector,
map: tcx.hir(),
codes: ErrorCodes::from(
compiler.session().opts.unstable_features.is_nightly_build(),
compiler.sess.opts.unstable_features.is_nightly_build(),
),
tcx,
};
@ -150,7 +150,7 @@ pub(crate) fn run(options: RustdocOptions) -> Result<(), ErrorGuaranteed> {
collector
});
if compiler.session().diagnostic().has_errors_or_lint_errors().is_some() {
if compiler.sess.diagnostic().has_errors_or_lint_errors().is_some() {
FatalError.raise();
}

2
src/librustdoc/lib.rs
View file

@ -794,7 +794,7 @@ fn main_args(
let config = core::create_config(options, &render_options, using_internal_features);
interface::run_compiler(config, |compiler| {
let sess = compiler.session();
let sess = &compiler.sess;
if sess.opts.describe_lints {
rustc_driver::describe_lints(sess);