---

yaml
---
r: 80691
b: refs/heads/try
c: b9a8b37
h: refs/heads/master
i:
  80689: 56f781a
  80687: 4df5489
v: v3

Author: jbclements

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 4c6bf4872012c010f84dc7fa2cdfe87522533f89
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cbd1eefbd350797b783df119fed7956d7e1c74ad
-refs/heads/try: cbe79bbbd3062973add9306e958af4d87de98065
+refs/heads/try: b9a8b3700b6f3b49a9b31af1e55caaa147f069e9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/librust/rust.rs

@@ -60,14 +60,20 @@ struct Command<'self> {
     usage_full: UsageSource<'self>,
 }
 
-static COMMANDS: &'static [Command<'static>] = &'static [
-    Command {
+static NUM_OF_COMMANDS: uint = 7;
+
+// FIXME(#7617): should just be &'static [Command<'static>]
+// but mac os doesn't seem to like that and tries to loop
+// past the end of COMMANDS in usage thus passing garbage
+// to str::repeat and eventually malloc and crashing.
+static COMMANDS: [Command<'static>, .. NUM_OF_COMMANDS] = [
+    Command{
         cmd: "build",
         action: CallMain("rustc", rustc::main_args),
         usage_line: "compile rust source files",
         usage_full: UsgCall(rustc_help),
     },
-    Command {
+    Command{
         cmd: "run",
         action: Call(cmd_run),
         usage_line: "build an executable, and run it",
@@ -77,7 +83,7 @@ static COMMANDS: &'static [Command<'static>] = &'static [
             \n\nUsage:\trust run <filename> [<arguments>...]"
         )
     },
-    Command {
+    Command{
         cmd: "test",
         action: Call(cmd_test),
         usage_line: "build a test executable, and run it",
@@ -87,25 +93,25 @@ static COMMANDS: &'static [Command<'static>] = &'static [
             ./<filestem>test~\"\n\nUsage:\trust test <filename>"
         )
     },
-    Command {
+    Command{
         cmd: "doc",
         action: CallMain("rustdoc", rustdoc::main_args),
         usage_line: "generate documentation from doc comments",
         usage_full: UsgCall(rustdoc::config::usage),
     },
-    Command {
+    Command{
         cmd: "pkg",
         action: CallMain("rustpkg", rustpkg::main_args),
         usage_line: "download, build, install rust packages",
         usage_full: UsgCall(rustpkg::usage::general),
     },
-    Command {
+    Command{
         cmd: "sketch",
         action: CallMain("rusti", rusti::main_args),
         usage_line: "run a rust interpreter",
         usage_full: UsgStr("\nUsage:\trusti"),
     },
-    Command {
+    Command{
         cmd: "help",
         action: Call(cmd_help),
         usage_line: "show detailed usage of a command",

branches/try/src/libsyntax/ast.rs

@@ -47,7 +47,8 @@ impl Eq for Ident {
             // if it should be non-hygienic (most things are), just compare the
             // 'name' fields of the idents. Or, even better, replace the idents
             // with Name's.
-            fail!(fmt!("not allowed to compare these idents: %?, %?", self, other));
+            fail!(fmt!("not allowed to compare these idents: %?, %?. Probably \
+                       related to issue #6993", self, other));
         }
     }
     fn ne(&self, other: &Ident) -> bool {