diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-06-16 18:45:13 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-06-16 19:05:08 -0700 |
| commit | b9adb6c717627ab6dcc9298b79a8d44cfe2fc616 (patch) | |
| tree | fb58639ed0d26d010c9ebde7beff9da9836e54ce | |
| parent | 375c5b884fd41e637bf0eff6d58c16cc18b179a9 (diff) | |
Test fixes from rollup
Closes #14888 (Allow disabling jemalloc as the memory allocator) Closes #14905 (rustc: Improve span for error about using a method as a field.) Closes #14920 (Fix #14915) Closes #14924 (Add a Syntastic plugin for Rust.) Closes #14935 (debuginfo: Correctly handle indirectly recursive types) Closes #14938 (Reexport `num_cpus` in `std::os`. Closes #14707) Closes #14941 (std: Don't fail the task when a Future is dropped) Closes #14942 (rustc: Don't mark type parameters as exported) Closes #14943 (doc: Fix a link in the FAQ) Closes #14944 (Update "use" to "uses" on ln186) Closes #14949 (Update repo location) Closes #14950 (fix typo in the libc crate) Closes #14951 (Update Sublime Rust github link) Closes #14953 (Fix --disable-rpath and tests)
| -rw-r--r-- | mk/tests.mk | 3 | ||||
| -rw-r--r-- | src/librustc/middle/typeck/check/mod.rs | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mk/tests.mk b/mk/tests.mk index 6ea2d9cbe8e..1989d6ef867 100644 --- a/mk/tests.mk +++ b/mk/tests.mk @@ -376,7 +376,8 @@ $(3)/stage$(1)/test/$(4)test-$(2)$$(X_$(2)): \ @$$(call E, rustc: $$@) $$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test \ -L "$$(RT_OUTPUT_DIR_$(2))" \ - -L "$$(LLVM_LIBDIR_$(2))" + -L "$$(LLVM_LIBDIR_$(2))" \ + $$(RUSTFLAGS_$(4)) endef diff --git a/src/librustc/middle/typeck/check/mod.rs b/src/librustc/middle/typeck/check/mod.rs index c87b7ec76ee..73b92e5b868 100644 --- a/src/librustc/middle/typeck/check/mod.rs +++ b/src/librustc/middle/typeck/check/mod.rs @@ -2365,7 +2365,8 @@ fn check_expr_with_unifier(fcx: &FnCtxt, ty::ty_struct(base_id, ref substs) => { debug!("struct named {}", ppaux::ty_to_str(tcx, base_t)); let fields = ty::lookup_struct_fields(tcx, base_id); - lookup_field_ty(tcx, base_id, fields.as_slice(), field.node.name, &(*substs)) + lookup_field_ty(tcx, base_id, fields.as_slice(), + field.node.name, &(*substs)) } _ => None } |