OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

librust: Remove unnecessary workaround. Closes #7617

Browse Source
This commit is contained in:
Luqman Aden 2013-09-12 00:25:08 -04:00
parent 62166611e7
commit cbe79bbbd3
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/librust/rust.rs
View File

@ -60,20 +60,14 @@ struct Command<'self> {
usage_full: UsageSource<'self>, usage_full: UsageSource<'self>,
} }
static NUM_OF_COMMANDS: uint = 7; static COMMANDS: &'static [Command<'static>] = &'static [
Command {
// 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", cmd: "build",
action: CallMain("rustc", rustc::main_args), action: CallMain("rustc", rustc::main_args),
usage_line: "compile rust source files", usage_line: "compile rust source files",
usage_full: UsgCall(rustc_help), usage_full: UsgCall(rustc_help),
}, },
Command{ Command {
cmd: "run", cmd: "run",
action: Call(cmd_run), action: Call(cmd_run),
usage_line: "build an executable, and run it", usage_line: "build an executable, and run it",
@ -83,7 +77,7 @@ static COMMANDS: [Command<'static>, .. NUM_OF_COMMANDS] = [
\n\nUsage:\trust run <filename> [<arguments>...]" \n\nUsage:\trust run <filename> [<arguments>...]"
) )
}, },
Command{ Command {
cmd: "test", cmd: "test",
action: Call(cmd_test), action: Call(cmd_test),
usage_line: "build a test executable, and run it", usage_line: "build a test executable, and run it",
@ -93,25 +87,25 @@ static COMMANDS: [Command<'static>, .. NUM_OF_COMMANDS] = [
./<filestem>test~\"\n\nUsage:\trust test <filename>" ./<filestem>test~\"\n\nUsage:\trust test <filename>"
) )
}, },
Command{ Command {
cmd: "doc", cmd: "doc",
action: CallMain("rustdoc", rustdoc::main_args), action: CallMain("rustdoc", rustdoc::main_args),
usage_line: "generate documentation from doc comments", usage_line: "generate documentation from doc comments",
usage_full: UsgCall(rustdoc::config::usage), usage_full: UsgCall(rustdoc::config::usage),
}, },
Command{ Command {
cmd: "pkg", cmd: "pkg",
action: CallMain("rustpkg", rustpkg::main_args), action: CallMain("rustpkg", rustpkg::main_args),
usage_line: "download, build, install rust packages", usage_line: "download, build, install rust packages",
usage_full: UsgCall(rustpkg::usage::general), usage_full: UsgCall(rustpkg::usage::general),
}, },
Command{ Command {
cmd: "sketch", cmd: "sketch",
action: CallMain("rusti", rusti::main_args), action: CallMain("rusti", rusti::main_args),
usage_line: "run a rust interpreter", usage_line: "run a rust interpreter",
usage_full: UsgStr("\nUsage:\trusti"), usage_full: UsgStr("\nUsage:\trusti"),
}, },
Command{ Command {
cmd: "help", cmd: "help",
action: Call(cmd_help), action: Call(cmd_help),
usage_line: "show detailed usage of a command", usage_line: "show detailed usage of a command",