Skip to content

Commit 0709e53

Browse files
committed
Fix rustdoc error with no providec crate-type, fix scrape examples button colors w/ themes
1 parent bcdab87 commit 0709e53

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

src/librustdoc/core.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use rustc_interface::interface;
1313
use rustc_middle::hir::nested_filter;
1414
use rustc_middle::ty::{ParamEnv, Ty, TyCtxt};
1515
use rustc_resolve as resolve;
16-
use rustc_session::config::{self, ErrorOutputType};
16+
use rustc_session::config::{self, CrateType, ErrorOutputType};
1717
use rustc_session::lint;
1818
use rustc_session::Session;
1919
use rustc_span::symbol::sym;
@@ -247,6 +247,7 @@ pub(crate) fn create_config(
247247
Some((lint.name_lower(), lint::Allow))
248248
});
249249

250+
let crate_types = if crate_types.is_empty() { vec![CrateType::Rlib] } else { crate_types };
250251
let test = scrape_examples_options.map(|opts| opts.scrape_tests).unwrap_or(false);
251252
// plays with error output here!
252253
let sessopts = config::Options {

src/librustdoc/doctest.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use rustc_middle::hir::nested_filter;
1212
use rustc_middle::ty::TyCtxt;
1313
use rustc_parse::maybe_new_parser_from_source_str;
1414
use rustc_parse::parser::attr::InnerAttrPolicy;
15-
use rustc_session::config::{self, ErrorOutputType};
15+
use rustc_session::config::{self, CrateType, ErrorOutputType};
1616
use rustc_session::parse::ParseSess;
1717
use rustc_session::{lint, Session};
1818
use rustc_span::edition::Edition;
@@ -68,7 +68,11 @@ pub(crate) fn run(options: RustdocOptions) -> Result<(), ErrorGuaranteed> {
6868

6969
debug!(?lint_opts);
7070

71-
let crate_types = options.crate_types.clone();
71+
let crate_types = if options.crate_types.is_empty() {
72+
vec![CrateType::Rlib]
73+
} else {
74+
options.crate_types.clone()
75+
};
7276

7377
let sessopts = config::Options {
7478
maybe_sysroot: options.maybe_sysroot.clone(),

src/librustdoc/html/static/css/rustdoc.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1948,6 +1948,7 @@ in storage.js
19481948
.scraped-example .code-wrapper .next,
19491949
.scraped-example .code-wrapper .prev,
19501950
.scraped-example .code-wrapper .expand {
1951+
color: var(--main-color);
19511952
position: absolute;
19521953
top: 0.25em;
19531954
z-index: 1;

0 commit comments

Comments
 (0)