Skip to content

Commit 23b2dae

Browse files
committed
---
yaml --- r: 110047 b: refs/heads/auto c: 74ddaa2 h: refs/heads/master i: 110045: e39e79f 110043: acd46e3 110039: 046de7b 110031: 229f7e9 110015: 0a1d728 v: v3
1 parent cd33b14 commit 23b2dae

File tree

2 files changed

+1
-24
lines changed

2 files changed

+1
-24
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: 5a4c8a9c5764bf323f55f94603453dffbba6b1cc
16+
refs/heads/auto: 74ddaa27e759c1b00cf1e369d17bec4be5c16aee
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/librustc/back/archive.rs

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -87,29 +87,6 @@ impl<'a> Archive<'a> {
8787
Archive { sess: sess, dst: dst }
8888
}
8989

90-
/// Read a file in the archive
91-
pub fn read(&self, file: &str) -> Vec<u8> {
92-
// Apparently if "ar p" is used on windows, it generates a corrupt file
93-
// which has bad headers and LLVM will immediately choke on it
94-
if cfg!(windows) {
95-
let loc = TempDir::new("rsar").unwrap();
96-
let archive = os::make_absolute(&self.dst);
97-
run_ar(self.sess, "x", Some(loc.path()), [&archive,
98-
&Path::new(file)]);
99-
let result: Vec<u8> =
100-
fs::File::open(&loc.path().join(file)).read_to_end()
101-
.unwrap()
102-
.move_iter()
103-
.collect();
104-
result
105-
} else {
106-
run_ar(self.sess,
107-
"p",
108-
None,
109-
[&self.dst, &Path::new(file)]).output.move_iter().collect()
110-
}
111-
}
112-
11390
/// Adds all of the contents of a native library to this archive. This will
11491
/// search in the relevant locations for a library named `name`.
11592
pub fn add_native_library(&mut self, name: &str) -> io::IoResult<()> {

0 commit comments

Comments
 (0)