Skip to content

Commit 84566f8

Browse files
committed
Follow the latest changes up to 2014-03-23
related issues of mozilla/rust: - rust-lang/rust#12772 rename std::vec -> std::slice - rust-lang/rust#13028 rename std::vec_ng -> std::vec - rust-lang/rust@0305ed5 std: Add Vec to the prelude - rust-lang/rust#12935 Disallow trailing parentheses for nullary enum variants
1 parent 266aa74 commit 84566f8

File tree

4 files changed

+1
-5
lines changed

4 files changed

+1
-5
lines changed

src/mustache/encoder.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ extern crate serialize;
22
extern crate collections;
33

44
use std::str;
5-
use std::vec_ng::Vec;
65
use collections::hashmap::HashMap;
76

87
/// Represents template data.

src/mustache/mustache.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ extern crate collections;
66

77
use std::io::File;
88
use std::str;
9-
use std::vec_ng::Vec;
109
use collections::hashmap::HashMap;
1110

1211
pub use parser::{Token, Parser};
@@ -79,7 +78,7 @@ impl Context {
7978
// TODO: maybe allow UTF-16 as well?
8079
let template = match str::from_utf8(s) {
8180
Some(string) => string,
82-
None() => {println!("Error: File is not UTF-8 encoded"); return None;}
81+
None => {println!("Error: File is not UTF-8 encoded"); return None;}
8382
};
8483
Some(self.compile(template.chars()))
8584
}

src/mustache/parser.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use std::vec_ng::Vec;
21
use std::char;
32
use std::mem;
43

src/mustache/test.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ extern crate collections;
88
#[cfg(test)]
99
mod test {
1010
use std::str;
11-
use std::vec_ng::Vec;
1211
use collections::hashmap::HashMap;
1312
use std::io::{File, TempDir};
1413
use serialize::json;

0 commit comments

Comments
 (0)