Convert all ~str to StrBuf

Makefile

@@ -11,7 +11,7 @@ ctags:
 
 docs:
  rm -rf doc
- rustdoc --test src/lib.rs
+ rustdoc -L . --test src/lib.rs
  rustdoc src/lib.rs
  # WTF is rustdoc doing?
  chmod 755 doc
@@ -37,7 +37,7 @@ test-clean:
  rm -rf ./test-runner ./bench-runner
 
 clean: test-clean
- rm -f *.rlib
+ rm -f *.rlib *.so
 
 push:
  git push origin master

README.md

@@ -23,7 +23,7 @@ fn main() {
  let fp = &Path::new("./data/simple.csv");
  let mut rdr = csv::Decoder::from_file(fp);
 
- for (s1, s2, dist) in rdr.decode_iter::<(~str, ~str, uint)>() {
+ for (s1, s2, dist) in rdr.decode_iter::<(StrBuf, StrBuf, uint)>() {
  println!("({}, {}): {}", s1, s2, dist);
  }
 }
@@ -39,8 +39,8 @@ use std::path::Path;
 
 #[deriving(Decodable)]
 struct Record {
- s1: ~str,
- s2: ~str,
+ s1: StrBuf,
+ s2: StrBuf,
  dist: uint,
 }
 
@@ -59,8 +59,8 @@ Do some records not have a distance for some reason? Use an `Option` type!
 ```rust
 #[deriving(Decodable)]
 struct Record {
- s1: ~str,
- s2: ~str,
+ s1: StrBuf,
+ s2: StrBuf,
  dist: Option<uint>,
 }
 ```

examples/data/2012_nfl_pbp_data.csv

@@ -0,0 +1 @@
+large.csv

examples/nfl_plays.rs

@@ -6,16 +6,16 @@ use csv::Decoder;
 
 #[deriving(Decodable)]
 struct Play {
- gameid: ~str,
+ gameid: StrBuf,
  qtr: uint,
  min: Option<uint>,
  sec: Option<uint>,
- team_off: ~str,
- team_def: ~str,
+ team_off: StrBuf,
+ team_def: StrBuf,
  down: Option<uint>,
  togo: Option<uint>,
  ydline: Option<uint>,
- description: ~str,
+ description: StrBuf,
  offscore: uint,
  defscore: uint,
  season: uint,
@@ -32,9 +32,9 @@ fn main() {
  println!("Found {} plays.", plays.len());
 
  let tfb = plays.iter().find(|&p| {
- "NE" == p.team_off && "DEN" == p.team_def
- && p.description.contains("TOUCHDOWN")
- && p.description.contains("T.Brady")
+ "NE" == p.team_off.as_slice() && "DEN" == p.team_def.as_slice()
+ && p.description.as_slice().contains("TOUCHDOWN")
+ && p.description.as_slice().contains("T.Brady")
  }).unwrap();
  println!("Tom Brady touchdown: {}", tfb.description);
  }

examples/simple.rs

@@ -6,7 +6,7 @@ fn main() {
  let fp = &Path::new("./data/simple.csv");
  let mut rdr = csv::Decoder::from_file(fp);
 
- for (s1, s2, dist) in rdr.decode_iter::<(~str, ~str, uint)>() {
+ for (s1, s2, dist) in rdr.decode_iter::<(StrBuf, StrBuf, uint)>() {
  println!("({}, {}): {}", s1, s2, dist);
  }
 }

examples/simple_missing.rs

@@ -5,8 +5,8 @@ use std::path::Path;
 
 #[deriving(Decodable)]
 struct Record {
- s1: ~str,
- s2: ~str,
+ s1: StrBuf,
+ s2: StrBuf,
  dist: Option<uint>,
 }
 

examples/simple_struct.rs

@@ -5,8 +5,8 @@ use std::path::Path;
 
 #[deriving(Decodable)]
 struct Record {
- s1: ~str,
- s2: ~str,
+ s1: StrBuf,
+ s2: StrBuf,
  dist: uint,
 }
 

examples/test

@@ -3,7 +3,7 @@
 set -e
 
 for f in *.rs; do
- rustc "$f"
+ rustc -L.. "$f"
  ./${f%%.rs}
  rm -f ${f%%.rs}
 done