Skip to content

Commit 719dcce

Browse files
committed
---
yaml --- r: 34273 b: refs/heads/snap-stage3 c: 3ee1d3e h: refs/heads/master i: 34271: b16d0e2 v: v3
1 parent 30b4872 commit 719dcce

File tree

5 files changed

+14
-2
lines changed

5 files changed

+14
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 6c056976678e103f23fd29557174d7718b75a617
4+
refs/heads/snap-stage3: 3ee1d3ebb81de199fc630a86933ac18c0a869482
55
refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libcargo/pgp.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ fn verify(root: &Path, data: &Path, sig: &Path) -> bool {
102102
let path = root.push("gpg");
103103
let res = gpgv(~[~"--homedir", path.to_str(),
104104
~"--keyring", ~"pubring.gpg",
105-
~"--verify",
105+
~"--verbose",
106106
sig.to_str(), data.to_str()]);
107107
if res.status != 0 {
108108
return false;

branches/snap-stage3/src/librusti/rusti.rc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,9 @@ fn run(repl: Repl, input: ~str) -> Repl {
246246
debug!("loop checking");
247247
middle::check_loop::check_crate(ty_cx, crate);
248248

249+
debug!("mode computation");
250+
middle::mode::compute_modes(ty_cx, method_map, crate);
251+
249252
debug!("alt checking");
250253
middle::check_alt::check_crate(ty_cx, method_map, crate);
251254

branches/snap-stage3/src/libstd/time.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1170,6 +1170,7 @@ mod tests {
11701170
}
11711171

11721172
#[test]
1173+
#[ignore(reason = "randomred")]
11731174
fn test_ctime() {
11741175
os::setenv(~"TZ", ~"America/Los_Angeles");
11751176
tzset();
@@ -1185,6 +1186,7 @@ mod tests {
11851186
}
11861187

11871188
#[test]
1189+
#[ignore(reason = "randomred")]
11881190
fn test_strftime() {
11891191
os::setenv(~"TZ", ~"America/Los_Angeles");
11901192
tzset();

branches/snap-stage3/src/rustllvm/RustWrapper.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,13 @@ void *RustMCJITMemoryManager::getPointerToNamedFunction(const std::string &Name,
290290
void *Ptr = sys::DynamicLibrary::SearchForAddressOfSymbol(NameStr);
291291
if (Ptr) return Ptr;
292292

293+
// If it wasn't found and if it starts with an underscore ('_') character,
294+
// try again without the underscore.
295+
if (NameStr[0] == '_') {
296+
Ptr = sys::DynamicLibrary::SearchForAddressOfSymbol(NameStr+1);
297+
if (Ptr) return Ptr;
298+
}
299+
293300
if (AbortOnFailure)
294301
report_fatal_error("Program used external function '" + Name +
295302
"' which could not be resolved!");

0 commit comments

Comments
 (0)