diff options
| author | Brian Anderson <andersrb@gmail.com> | 2011-03-13 19:40:25 -0400 |
|---|---|---|
| committer | Brian Anderson <andersrb@gmail.com> | 2011-03-13 19:40:25 -0400 |
| commit | bbb6836da003be71744b6e6ea7af1fd4674f8291 (patch) | |
| tree | fc7780f767666cced8406818806216bee3863c91 /src/lib/_vec.rs | |
| parent | 2a662944a4d87c6d82299a181996ba14170b2ebb (diff) | |
| parent | fdc22ef1a1cef77dedb9c0429c746a81688a5979 (diff) | |
| download | rust-bbb6836da003be71744b6e6ea7af1fd4674f8291.tar.gz rust-bbb6836da003be71744b6e6ea7af1fd4674f8291.zip | |
Merge branch 'master' into recursive-elseif
Conflicts: src/comp/middle/typeck.rs
Diffstat (limited to 'src/lib/_vec.rs')
| -rw-r--r-- | src/lib/_vec.rs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/lib/_vec.rs b/src/lib/_vec.rs index 2ffe8bad08b..680c8884f6d 100644 --- a/src/lib/_vec.rs +++ b/src/lib/_vec.rs @@ -1,5 +1,4 @@ import vbuf = rustrt.vbuf; -import std.option; type operator2[T,U,V] = fn(&T, &U) -> V; |