Skip to content

Commit 1c76ea1

Browse files
committed
---
yaml --- r: 29868 b: refs/heads/incoming c: bf0d4cc h: refs/heads/master v: v3
1 parent e1f9437 commit 1c76ea1

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
9-
refs/heads/incoming: ee2f0dd63838a7d42007ee848a4a532dd97fdb54
9+
refs/heads/incoming: bf0d4cc035333dba65f650227ead9a669570e128
1010
refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/rustc/middle/resolve3.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1476,6 +1476,8 @@ class Resolver {
14761476
if has_constructor {
14771477
child_name_bindings.define_value(def, dummy_sp());
14781478
}
1479+
1480+
self.structs.insert(def_id, has_constructor);
14791481
}
14801482
def_self(*) | def_arg(*) | def_local(*) |
14811483
def_prim_ty(*) | def_ty_param(*) | def_binding(*) |
@@ -4409,7 +4411,7 @@ class Resolver {
44094411
// let bar = Bar { ... } // no type parameters
44104412

44114413
match self.resolve_path(path, TypeNS, false, visitor) {
4412-
some(def_ty(class_id))
4414+
some(def_ty(class_id)) | some(def_class(class_id, _))
44134415
if self.structs.contains_key(class_id) => {
44144416
let has_constructor = self.structs.get(class_id);
44154417
let class_def = def_class(class_id, has_constructor);

0 commit comments

Comments
 (0)