File tree Expand file tree Collapse file tree 2 files changed +5
-2
lines changed
branches/try/src/librustc/back Expand file tree Collapse file tree 2 files changed +5
-2
lines changed Original file line number Diff line number Diff line change 2
2
refs/heads/master: 62f1d68439dcfd509eaca29887afa97f22938373
3
3
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4
4
refs/heads/snap-stage3: 6e7f170fedd3c526a643c0b2d13863acd982be02
5
- refs/heads/try: 8922fa01228f5161aa0ebd714f86f2712a3c7ea8
5
+ refs/heads/try: 53b9484dafd92f442f8ed092e2648340c6cecf1f
6
6
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
7
7
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8
8
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
Original file line number Diff line number Diff line change @@ -145,7 +145,10 @@ impl Archive {
145
145
/// Lists all files in an archive
146
146
pub fn files ( & self ) -> ~[ ~str ] {
147
147
let output = run_ar ( self . sess , "t" , None , [ & self . dst ] ) ;
148
- str:: from_utf8 ( output. output ) . unwrap ( ) . lines ( ) . map ( |s| s. to_owned ( ) ) . collect ( )
148
+ let output = str:: from_utf8 ( output. output ) . unwrap ( ) ;
149
+ // use lines_any because windows delimits output with `\r\n` instead of
150
+ // just `\n`
151
+ output. lines_any ( ) . map ( |s| s. to_owned ( ) ) . collect ( )
149
152
}
150
153
151
154
fn add_archive ( & mut self , archive : & Path , name : & str ,
You can’t perform that action at this time.
0 commit comments