---

yaml
---
r: 277656
b: refs/heads/try
c: eeb2f6d
h: refs/heads/master

Author: alexcrichton

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 6dbb0e86aec11050480beb76eade6fb805010ba7
 refs/heads/snap-stage3: 235d77457d80b549dad3ac36d94f235208a1eafb
-refs/heads/try: 102bab3d6811eb2ca672730e853add3b568c6210
+refs/heads/try: eeb2f6dde44a58513d15750d7df96488fc1f2e8d
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/mk/tests.mk

@@ -616,7 +616,7 @@ ifdef CFG_ENABLE_DEBUGINFO_TESTS
 CTEST_RUSTC_FLAGS += -g
 endif
 
-CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3) := \
+CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3) = \
 		--compile-lib-path $$(HLIB$(1)_H_$(3)) \
         --run-lib-path $$(TLIB$(1)_T_$(2)_H_$(3)) \
         --rustc-path $$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \
@@ -686,7 +686,7 @@ $(foreach host,$(CFG_HOST), \
 
 define DEF_RUN_COMPILETEST
 
-CTEST_ARGS$(1)-T-$(2)-H-$(3)-$(4) := \
+CTEST_ARGS$(1)-T-$(2)-H-$(3)-$(4) = \
         $$(CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3)) \
         --src-base $$(S)src/test/$$(CTEST_SRC_BASE_$(4))/ \
         --build-base $(3)/test/$$(CTEST_BUILD_BASE_$(4))/ \
@@ -779,7 +779,7 @@ $(foreach host,$(CFG_HOST), \
 
 define DEF_RUN_PRETTY_TEST
 
-PRETTY_ARGS$(1)-T-$(2)-H-$(3)-$(4) := \
+PRETTY_ARGS$(1)-T-$(2)-H-$(3)-$(4) = \
 		$$(CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3)) \
         --src-base $$(S)src/test/$$(PRETTY_DIRNAME_$(4))/ \
         --build-base $(3)/test/$$(PRETTY_DIRNAME_$(4))/ \

branches/try/src/librustc_trans/debuginfo/metadata.rs

@@ -1159,12 +1159,12 @@ fn prepare_struct_metadata<'a, 'tcx>(cx: &CrateContext<'a, 'tcx>,
     let struct_name = compute_debuginfo_type_name(cx, struct_type, false);
     let struct_llvm_type = type_of::in_memory_type_of(cx, struct_type);
 
-    let (struct_def_id, variant, substs) = match struct_type.sty {
-        ty::TyStruct(def, substs) => (def.did, def.struct_variant(), substs),
+    let (variant, substs) = match struct_type.sty {
+        ty::TyStruct(def, substs) => (def.struct_variant(), substs),
         _ => bug!("prepare_struct_metadata on a non-struct")
     };
 
-    let (containing_scope, _) = get_namespace_and_span_for_item(cx, struct_def_id);
+    let (containing_scope, _) = get_namespace_and_span_for_item(cx, variant.did);
 
     let struct_metadata_stub = create_struct_stub(cx,
                                                   struct_llvm_type,

branches/try/src/test/debuginfo/struct-namespace.rs

@@ -880,62 +880,58 @@ fn cleanup_debug_info_options(options: &Option<String>) -> Option<String> {
 
 fn check_debugger_output(debugger_run_result: &ProcRes, check_lines: &[String]) {
     let num_check_lines = check_lines.len();
-
-    let mut check_line_index = 0;
-    for line in debugger_run_result.stdout.lines() {
-        if check_line_index >= num_check_lines {
-            break;
-        }
-
-        if check_single_line(line, &(check_lines[check_line_index])[..]) {
-            check_line_index += 1;
-        }
-    }
-    if check_line_index != num_check_lines && num_check_lines > 0 {
-        fatal_proc_rec(None, &format!("line not found in debugger output: {}",
-                                check_lines[check_line_index]),
-                      debugger_run_result);
-    }
-
-    fn check_single_line(line: &str, check_line: &str) -> bool {
+    if num_check_lines > 0 {
         // Allow check lines to leave parts unspecified (e.g., uninitialized
-        // bits in the  wrong case of an enum) with the notation "[...]".
-        let line = line.trim();
-        let check_line = check_line.trim();
-        let can_start_anywhere = check_line.starts_with("[...]");
-        let can_end_anywhere = check_line.ends_with("[...]");
-
-        let check_fragments: Vec<&str> = check_line.split("[...]")
-                                                   .filter(|frag| !frag.is_empty())
-                                                   .collect();
-        if check_fragments.is_empty() {
-            return true;
-        }
-
-        let (mut rest, first_fragment) = if can_start_anywhere {
-            match line.find(check_fragments[0]) {
-                Some(pos) => (&line[pos + check_fragments[0].len() ..], 1),
-                None => return false
-            }
-        } else {
-            (line, 0)
-        };
-
-        for fragment_index in first_fragment .. check_fragments.len() {
-            let current_fragment = check_fragments[fragment_index];
-            match rest.find(current_fragment) {
-                Some(pos) => {
-                    rest = &rest[pos + current_fragment.len() .. ];
+        // bits in the wrong case of an enum) with the notation "[...]".
+        let check_fragments: Vec<Vec<String>> =
+            check_lines.iter().map(|s| {
+                s
+                 .trim()
+                 .split("[...]")
+                 .map(str::to_owned)
+                 .collect()
+            }).collect();
+        // check if each line in props.check_lines appears in the
+        // output (in order)
+        let mut i = 0;
+        for line in debugger_run_result.stdout.lines() {
+            let mut rest = line.trim();
+            let mut first = true;
+            let mut failed = false;
+            for frag in &check_fragments[i] {
+                let found = if first {
+                    if rest.starts_with(frag) {
+                        Some(0)
+                    } else {
+                        None
+                    }
+                } else {
+                    rest.find(frag)
+                };
+                match found {
+                    None => {
+                        failed = true;
+                        break;
+                    }
+                    Some(i) => {
+                        rest = &rest[(i + frag.len())..];
+                    }
                 }
-                None => return false
+                first = false;
+            }
+            if !failed && rest.is_empty() {
+                i += 1;
+            }
+            if i == num_check_lines {
+                // all lines checked
+                break;
             }
         }
-
-        if !can_end_anywhere && !rest.is_empty() {
-            return false;
+        if i != num_check_lines {
+            fatal_proc_rec(None, &format!("line not found in debugger output: {}",
+                                    check_lines.get(i).unwrap()),
+                          debugger_run_result);
         }
-
-        return true;
     }
 }