Skip to content

Commit d76a251

Browse files
---
yaml --- r: 276897 b: refs/heads/try c: 669edfa h: refs/heads/master i: 276895: 13f5ee1
1 parent eee8be6 commit d76a251

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 6dbb0e86aec11050480beb76eade6fb805010ba7
33
refs/heads/snap-stage3: 235d77457d80b549dad3ac36d94f235208a1eafb
4-
refs/heads/try: ded701bf64012f0412836c017e74cc31bfdbe0cf
4+
refs/heads/try: 669edfaef4260de77e27ae5dc66f48d19a47e750
55
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
66
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
77
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/src/librustdoc/html/render.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ pub fn run(mut krate: clean::Crate,
433433
krate: krate.name.clone(),
434434
playground_url: "".to_string(),
435435
},
436-
css_file_extension: css_file_extension,
436+
css_file_extension: css_file_extension.clone(),
437437
};
438438

439439
// Crawl the crate attributes looking for attributes which control how we're
@@ -653,7 +653,7 @@ fn write_shared(cx: &Context,
653653
include_bytes!("static/rustdoc.css"))?;
654654
write(cx.dst.join("main.css"),
655655
include_bytes!("static/styles/main.css"))?;
656-
if let Some(ref css) = cx.css_file_extension {
656+
if let Some(ref css) = cx.shared.css_file_extension {
657657
let mut content = String::new();
658658
let css = css.as_path();
659659
let mut f = try_err!(File::open(css), css);
@@ -948,9 +948,9 @@ impl<'a> SourceCollector<'a> {
948948
description: &desc,
949949
keywords: BASIC_KEYWORDS,
950950
};
951-
layout::render(&mut w, &self.cx.layout,
951+
layout::render(&mut w, &self.scx.layout,
952952
&page, &(""), &Source(contents),
953-
self.cx.css_file_extension.is_some())?;
953+
self.scx.css_file_extension.is_some())?;
954954
w.flush()?;
955955
self.scx.local_sources.insert(p, href);
956956
Ok(())
@@ -1313,7 +1313,7 @@ impl Context {
13131313
layout::render(&mut writer, &cx.shared.layout, &page,
13141314
&Sidebar{ cx: cx, item: it },
13151315
&Item{ cx: cx, item: it },
1316-
cx.css_file_extension.is_some())?;
1316+
cx.shared.css_file_extension.is_some())?;
13171317
} else {
13181318
let mut url = repeat("../").take(cx.current.len())
13191319
.collect::<String>();

0 commit comments

Comments
 (0)