Skip to content

Commit 9311b9e

Browse files
committed
---
yaml --- r: 150485 b: refs/heads/try2 c: 74ddaa2 h: refs/heads/master i: 150483: d440be0 v: v3
1 parent 60206eb commit 9311b9e

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
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 5a4c8a9c5764bf323f55f94603453dffbba6b1cc
8+
refs/heads/try2: 74ddaa27e759c1b00cf1e369d17bec4be5c16aee
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/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)