Skip to content

Commit b9adb6c

Browse files
committed
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)
1 parent 375c5b8 commit b9adb6c

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

mk/tests.mk

+2-1
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,8 @@ $(3)/stage$(1)/test/$(4)test-$(2)$$(X_$(2)): \
376376
@$$(call E, rustc: $$@)
377377
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test \
378378
-L "$$(RT_OUTPUT_DIR_$(2))" \
379-
-L "$$(LLVM_LIBDIR_$(2))"
379+
-L "$$(LLVM_LIBDIR_$(2))" \
380+
$$(RUSTFLAGS_$(4))
380381

381382
endef
382383

src/librustc/middle/typeck/check/mod.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -2365,7 +2365,8 @@ fn check_expr_with_unifier(fcx: &FnCtxt,
23652365
ty::ty_struct(base_id, ref substs) => {
23662366
debug!("struct named {}", ppaux::ty_to_str(tcx, base_t));
23672367
let fields = ty::lookup_struct_fields(tcx, base_id);
2368-
lookup_field_ty(tcx, base_id, fields.as_slice(), field.node.name, &(*substs))
2368+
lookup_field_ty(tcx, base_id, fields.as_slice(),
2369+
field.node.name, &(*substs))
23692370
}
23702371
_ => None
23712372
}

0 commit comments

Comments
 (0)