Skip to content

Commit 7d25baf

Browse files
---
yaml --- r: 272351 b: refs/heads/auto c: 669edfa h: refs/heads/master i: 272349: 96a6fc8 272347: b62b2d0 272343: 6ad1cc1 272335: f9e9c14 272319: 01dc4b4
1 parent 05dfa22 commit 7d25baf

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
@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
88
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
99
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1010
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
11-
refs/heads/auto: ded701bf64012f0412836c017e74cc31bfdbe0cf
11+
refs/heads/auto: 669edfaef4260de77e27ae5dc66f48d19a47e750
1212
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1313
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
1414
refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/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)