diff options
| author | Graydon Hoare <graydon@mozilla.com> | 2010-08-10 13:26:00 -0700 |
|---|---|---|
| committer | Graydon Hoare <graydon@mozilla.com> | 2010-08-10 13:26:00 -0700 |
| commit | dbe8760af3b50bfa14d39406fe0eca2f2b82d8ec (patch) | |
| tree | c5f89fa72e9c28ced0a533a498d64eee30f26f3f /src/rt/rust.cpp | |
| parent | 75e46cc4d0fbd8f1a1c4676931119a858fafeacf (diff) | |
| parent | b71340552fa0caa870877f87a1273e8d4c91efe6 (diff) | |
| download | rust-dbe8760af3b50bfa14d39406fe0eca2f2b82d8ec.tar.gz rust-dbe8760af3b50bfa14d39406fe0eca2f2b82d8ec.zip | |
Merge commit 'jyasskin/work'
Conflicts: src/rt/rust_dom.cpp src/rt/rust_upcall.cpp
Diffstat (limited to 'src/rt/rust.cpp')
| -rw-r--r-- | src/rt/rust.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rt/rust.cpp b/src/rt/rust.cpp index a7ad1732552..d0215edc18b 100644 --- a/src/rt/rust.cpp +++ b/src/rt/rust.cpp @@ -184,7 +184,7 @@ rust_start(uintptr_t main_fn, rust_crate const *crate, int argc, char **argv) int ret; { rust_srv srv; - rust_dom dom(&srv, crate); + rust_dom dom(&srv, crate, "main"); command_line_args args(dom, argc, argv); dom.log(rust_log::DOM, "startup: %d args", args.argc); |