File tree Expand file tree Collapse file tree 2 files changed +5
-2
lines changed
branches/snap-stage3/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 1
1
---
2
2
refs/heads/master: e3b1f3c443c048913e2d573fcc5a9c2be3484a78
3
3
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4
- refs/heads/snap-stage3: 8922fa01228f5161aa0ebd714f86f2712a3c7ea8
4
+ refs/heads/snap-stage3: 53b9484dafd92f442f8ed092e2648340c6cecf1f
5
5
refs/heads/try: a97642026c18a624ff6ea01075dd9550f8ed07ff
6
6
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
7
7
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
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