Skip to content

Commit a8a9be8

Browse files
committed
---
yaml --- r: 236461 b: refs/heads/auto c: c8f5f6f h: refs/heads/master i: 236459: 9f36d63 v: v3
1 parent 34d6d8d commit a8a9be8

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
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: 5ac899c8c274619895b7595245862cfa5b9c5dd9
11+
refs/heads/auto: c8f5f6f70f81a53d708af06b3b96902590e6322c
1212
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1313
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
1414
refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/src/rustbook/build.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ fn write_toc(book: &Book, current_page: &BookItem, out: &mut Write) -> io::Resul
8282
}
8383

8484
fn render(book: &Book, tgt: &Path) -> CliResult<()> {
85-
let tmp = try!(TempDir::new("rust-book"));
85+
let tmp = try!(TempDir::new("rustbook"));
8686

8787
for (_section, item) in book.iter() {
8888
let out_path = match item.path.parent() {
@@ -144,7 +144,7 @@ fn render(book: &Book, tgt: &Path) -> CliResult<()> {
144144
format!("--html-before-content={}", prelude.display()),
145145
format!("--html-after-content={}", postlude.display()),
146146
format!("--markdown-playground-url=https://play.rust-lang.org"),
147-
format!("--markdown-css={}", item.path_to_root.join("rust-book.css").display()),
147+
format!("--markdown-css={}", item.path_to_root.join("rustbook.css").display()),
148148
"--markdown-no-toc".to_string(),
149149
];
150150
let output_result = rustdoc::main_args(rustdoc_args);
@@ -199,10 +199,10 @@ impl Subcommand for Build {
199199
let css = include_bytes!("static/rustbook.css");
200200
let js = include_bytes!("static/rustbook.js");
201201

202-
let mut css_file = try!(File::create(tgt.join("rust-book.css")));
202+
let mut css_file = try!(File::create(tgt.join("rustbook.css")));
203203
try!(css_file.write_all(css));
204204

205-
let mut js_file = try!(File::create(tgt.join("rust-book.js")));
205+
let mut js_file = try!(File::create(tgt.join("rustbook.js")));
206206
try!(js_file.write_all(js));
207207

208208

branches/auto/src/rustbook/help.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ impl Subcommand for Help {
3636
}
3737

3838
pub fn usage() {
39-
println!("Usage: rust-book <command> [<args>]");
39+
println!("Usage: rustbook <command> [<args>]");
4040
println!("");
4141
println!("The <command> must be one of:");
4242
println!(" help Print this message.");

branches/auto/src/rustbook/javascript.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
// The rust-book JavaScript in string form.
1212

1313
pub static JAVASCRIPT: &'static str = r#"
14-
<script type="text/javascript" src="rust-book.js"></script>
14+
<script type="text/javascript" src="rustbook.js"></script>
1515
<script type="text/javascript" src="playpen.js"></script>
1616
"#;

branches/auto/src/rustbook/subcommand.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
//! Common API for all rust-book subcommands.
11+
//! Common API for all rustbook subcommands.
1212
1313
use error::CliResult;
1414
use error::CommandResult;

0 commit comments

Comments
 (0)