---

yaml
---
r: 80828
b: refs/heads/try
c: c678841
h: refs/heads/master
v: v3

Author: dcrewi

[refs]

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

branches/try/src/librust/rust.rs

@@ -84,7 +84,8 @@ static COMMANDS: &'static [Command<'static>] = &'static [
         usage_full: UsgStr(
             "The test command is an shortcut for the command line \n\
             \"rustc --test <filename> -o <filestem>test~ && \
-            ./<filestem>test~\"\n\nUsage:\trust test <filename>"
+            ./<filestem>test~ [<arguments>...]\"\
+            \n\nUsage:\trust test <filename> [<arguments>...]"
         )
     },
     Command {
@@ -155,12 +156,12 @@ fn cmd_help(args: &[~str]) -> ValidUsage {
 
 fn cmd_test(args: &[~str]) -> ValidUsage {
     match args {
-        [ref filename] => {
+        [ref filename, ..prog_args] => {
             let p = Path(*filename);
             let test_exec = p.filestem().unwrap() + "test~";
             invoke("rustc", &[~"--test", filename.to_owned(),
                               ~"-o", test_exec.to_owned()], rustc::main_args);
-            let exit_code = run::process_status(~"./" + test_exec, []);
+            let exit_code = run::process_status(~"./" + test_exec, prog_args);
             Valid(exit_code)
         }
         _ => Invalid

branches/try/src/librustc/lib/llvm.rs

@@ -2117,9 +2117,6 @@ pub mod llvm {
                                             LineNo: c_uint)
                                             -> ValueRef;
 
-        #[fast_ffi]
-        pub fn LLVMDICompositeTypeSetTypeArray(CompositeType: ValueRef, TypeArray: ValueRef);
-
         #[fast_ffi]
         pub fn LLVMIsAArgument(value_ref: ValueRef) -> ValueRef;
 

branches/try/src/librustc/middle/trans/debuginfo.rs

@@ -235,7 +235,7 @@ pub fn region_to_str(cx: ctxt, prefix: &str, space: bool, region: Region) -> ~st
     }
 }
 
-pub fn mutability_to_str(m: ast::Mutability) -> ~str {
+fn mutability_to_str(m: ast::Mutability) -> ~str {
     match m {
         ast::MutMutable => ~"mut ",
         ast::MutImmutable => ~"",

branches/try/src/librustc/util/ppaux.rs

@@ -38,16 +38,6 @@ pub enum path_elt {
     path_pretty_name(Ident, u64),
 }
 
-impl path_elt {
-    pub fn ident(&self) -> Ident {
-        match *self {
-            path_mod(ident)            |
-            path_name(ident)           |
-            path_pretty_name(ident, _) => ident
-        }
-    }
-}
-
 pub type path = ~[path_elt];
 
 pub fn path_to_str_with_sep(p: &[path_elt], sep: &str, itr: @ident_interner)

branches/try/src/libsyntax/ast_map.rs

@@ -789,10 +789,3 @@ extern "C" LLVMValueRef LLVMDIBuilderCreateNameSpace(
         unwrapDI<DIFile>(File),
         LineNo));
 }
-
-extern "C" void LLVMDICompositeTypeSetTypeArray(
-    LLVMValueRef CompositeType,
-    LLVMValueRef TypeArray)
-{
-    unwrapDI<DICompositeType>(CompositeType).setTypeArray(unwrapDI<DIArray>(TypeArray));
-}

branches/try/src/rustllvm/RustWrapper.cpp

@@ -612,7 +612,6 @@ LLVMDIBuilderCreateOpDeref
 LLVMDIBuilderCreateOpPlus
 LLVMDIBuilderCreateComplexVariable
 LLVMDIBuilderCreateNameSpace
-LLVMDICompositeTypeSetTypeArray
 LLVMSetUnnamedAddr
 LLVMRustAddPass
 LLVMRustAddAnalysisPasses