---

yaml
---
r: 39550
b: refs/heads/incoming
c: 3ee1d3e
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: 6c056976678e103f23fd29557174d7718b75a617
+refs/heads/incoming: 3ee1d3ebb81de199fc630a86933ac18c0a869482
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcargo/pgp.rs

@@ -102,7 +102,7 @@ fn verify(root: &Path, data: &Path, sig: &Path) -> bool {
     let path = root.push("gpg");
     let res = gpgv(~[~"--homedir", path.to_str(),
                   ~"--keyring", ~"pubring.gpg",
-                  ~"--verify",
+                  ~"--verbose",
                  sig.to_str(), data.to_str()]);
     if res.status != 0 {
         return false;

branches/incoming/src/librusti/rusti.rc

@@ -246,6 +246,9 @@ fn run(repl: Repl, input: ~str) -> Repl {
     debug!("loop checking");
     middle::check_loop::check_crate(ty_cx, crate);
 
+    debug!("mode computation");
+    middle::mode::compute_modes(ty_cx, method_map, crate);
+
     debug!("alt checking");
     middle::check_alt::check_crate(ty_cx, method_map, crate);
 

branches/incoming/src/libstd/time.rs

@@ -1170,6 +1170,7 @@ mod tests {
     }
 
     #[test]
+    #[ignore(reason = "randomred")]
     fn test_ctime() {
         os::setenv(~"TZ", ~"America/Los_Angeles");
         tzset();
@@ -1185,6 +1186,7 @@ mod tests {
     }
 
     #[test]
+    #[ignore(reason = "randomred")]
     fn test_strftime() {
         os::setenv(~"TZ", ~"America/Los_Angeles");
         tzset();

branches/incoming/src/rustllvm/RustWrapper.cpp

@@ -290,6 +290,13 @@ void *RustMCJITMemoryManager::getPointerToNamedFunction(const std::string &Name,
   void *Ptr = sys::DynamicLibrary::SearchForAddressOfSymbol(NameStr);
   if (Ptr) return Ptr;
 
+  // If it wasn't found and if it starts with an underscore ('_') character,
+  // try again without the underscore.
+  if (NameStr[0] == '_') {
+    Ptr = sys::DynamicLibrary::SearchForAddressOfSymbol(NameStr+1);
+    if (Ptr) return Ptr;
+  }
+
   if (AbortOnFailure)
     report_fatal_error("Program used external function '" + Name +
                       "' which could not be resolved!");