Skip to content

Commit 504806e

Browse files
committed
Update to latest Rust nightly build.
1 parent bed2f0d commit 504806e

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

src/cli/main.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#[crate_id = "rshighlight#0.1.0"];
2-
#[crate_type = "bin"];
3-
#[license = "MIT"];
1+
#![crate_id = "rshighlight#0.1.0"]
2+
#![crate_type = "bin"]
3+
#![license = "MIT"]
44

55
extern crate collections;
66
extern crate getopts;

src/highlight/backend/json.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ impl Backend for JsonBackend {
5050

5151
if self.pretty {
5252
let mut encoder = json::PrettyEncoder::new(w);
53-
colors.encode(&mut encoder);
53+
try!(colors.encode(&mut encoder));
5454
} else {
5555
let mut encoder = json::Encoder::new(w);
56-
colors.encode(&mut encoder);
56+
try!(colors.encode(&mut encoder));
5757
}
5858

5959
Ok(())
@@ -66,10 +66,10 @@ impl Backend for JsonBackend {
6666
fn code_end(&mut self, w: &mut Writer) -> IoResult<()> {
6767
if self.pretty {
6868
let mut encoder = json::PrettyEncoder::new(w);
69-
self.entries.encode(&mut encoder);
69+
try!(self.entries.encode(&mut encoder));
7070
} else {
7171
let mut encoder = json::Encoder::new(w);
72-
self.entries.encode(&mut encoder);
72+
try!(self.entries.encode(&mut encoder));
7373
}
7474

7575
Ok(())

src/highlight/core.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pub fn highlight(src: &str) -> Vec<Part> {
2424
parts
2525
}
2626
27-
fn do_highlight(sess: &parse::ParseSess, lexer: lexer::StringReader, parts: &mut Vec<Part>) {
27+
fn do_highlight(sess: &parse::ParseSess, mut lexer: lexer::StringReader, parts: &mut Vec<Part>) {
2828
use syntax::parse::lexer::Reader;
2929
3030
let mut last = BytePos(0);
@@ -35,7 +35,7 @@ fn do_highlight(sess: &parse::ParseSess, lexer: lexer::StringReader, parts: &mut
3535
loop {
3636
let next = lexer.next_token();
3737
let test = if next.tok == t::EOF {
38-
lexer.pos.get()
38+
lexer.pos
3939
} else {
4040
next.sp.lo
4141
};

src/highlight/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#[crate_id = "highlight#0.1.0"];
2-
#[crate_type = "dylib"];
3-
#[license = "MIT"];
1+
#![crate_id = "highlight#0.1.0"]
2+
#![crate_type = "dylib"]
3+
#![license = "MIT"]
44

55
extern crate syntax;
66
extern crate serialize;

0 commit comments

Comments
 (0)