Skip to content

Commit 30524e5

Browse files
committed
---
yaml --- r: 118591 b: refs/heads/try c: b9adb6c h: refs/heads/master i: 118589: a24c243 118587: 50bb07d 118583: 77b6a70 118575: 6a5a3c6 118559: 64f3426 118527: 090f3dd v: v3
1 parent 524614b commit 30524e5

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: b1646cbfd908dc948b251e362669af421100647a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: d6736a1440d42f6af967a8a20ab8d73522112b72
5-
refs/heads/try: 375c5b884fd41e637bf0eff6d58c16cc18b179a9
5+
refs/heads/try: b9adb6c717627ab6dcc9298b79a8d44cfe2fc616
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/mk/tests.mk

Lines changed: 2 additions & 1 deletion
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

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

Lines changed: 2 additions & 1 deletion
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)