Skip to content

Commit

Permalink
rustbook: Inline javascript.rs into build.rs
Browse files Browse the repository at this point in the history
There's no need for javascript.rs now that its contents were moved into
.js files.

Also, adjust a couple variable names and some indentation in build.rs.
  • Loading branch information
nhowell committed Sep 25, 2015
1 parent 115ec66 commit 9f770a7
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 35 deletions.
34 changes: 17 additions & 17 deletions src/rustbook/build.rs
Expand Up @@ -23,8 +23,6 @@ use error::{err, CliResult, CommandResult};
use book;
use book::{Book, BookItem};

use javascript;

use rustdoc;

struct Build;
Expand Down Expand Up @@ -113,26 +111,28 @@ fn render(book: &Book, tgt: &Path) -> CliResult<()> {
// write the prelude to a temporary HTML file for rustdoc inclusion
let prelude = tmp.path().join("prelude.html");
{
let mut toc = BufWriter::new(try!(File::create(&prelude)));
try!(writeln!(&mut toc, r#"<div id="nav">
<button id="toggle-nav">
<span class="sr-only">Toggle navigation</span>
<span class="bar"></span>
<span class="bar"></span>
<span class="bar"></span>
</button>
</div>"#));
let _ = write_toc(book, &item, &mut toc);
try!(writeln!(&mut toc, "<div id='page-wrapper'>"));
try!(writeln!(&mut toc, "<div id='page'>"));
let mut buffer = BufWriter::new(try!(File::create(&prelude)));
try!(writeln!(&mut buffer, r#"
<div id="nav">
<button id="toggle-nav">
<span class="sr-only">Toggle navigation</span>
<span class="bar"></span>
<span class="bar"></span>
<span class="bar"></span>
</button>
</div>"#));
let _ = write_toc(book, &item, &mut buffer);
try!(writeln!(&mut buffer, "<div id='page-wrapper'>"));
try!(writeln!(&mut buffer, "<div id='page'>"));
}

// write the postlude to a temporary HTML file for rustdoc inclusion
let postlude = tmp.path().join("postlude.html");
{
let mut toc = BufWriter::new(try!(File::create(&postlude)));
try!(toc.write_all(javascript::JAVASCRIPT.as_bytes()));
try!(writeln!(&mut toc, "</div></div>"));
let mut buffer = BufWriter::new(try!(File::create(&postlude)));
try!(writeln!(&mut buffer, "<script src='rustbook.js'></script>"));
try!(writeln!(&mut buffer, "<script src='playpen.js'></script>"));
try!(writeln!(&mut buffer, "</div></div>"));
}

try!(fs::create_dir_all(&out_path));
Expand Down
16 changes: 0 additions & 16 deletions src/rustbook/javascript.rs

This file was deleted.

2 changes: 0 additions & 2 deletions src/rustbook/main.rs
Expand Up @@ -35,8 +35,6 @@ mod build;
mod serve;
mod test;

mod javascript;

static EXIT_STATUS: AtomicIsize = ATOMIC_ISIZE_INIT;

fn main() {
Expand Down

0 comments on commit 9f770a7

Please sign in to comment.