Refactor TyStruct/TyEnum/TyUnion into TyAdt
#36331
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The diff looks much better with whitespaces ignored https://github.com/rust-lang/rust/pull/36331/files?w=1 |
| @@ -555,7 +555,7 @@ impl<'a, 'gcx, 'tcx> Struct { | |||
| } | |||
|
|
|||
| // Is this the NonZero lang item wrapping a pointer or integer type? | |||
| (&Univariant { non_zero: true, .. }, &ty::TyStruct(def, substs)) => { | |||
| (&Univariant { non_zero: true, .. }, &ty::TyAdt(def, substs)) if def.is_struct() => { | |||
There was a problem hiding this comment.
The guard is unnecessary (because non_zero means it's the NonZero lang item).
|
LGTM modulo somewhat minor |
| @@ -133,23 +128,27 @@ impl<'a, 'tcx> MarkSymbolVisitor<'a, 'tcx> { | |||
|
|
|||
| fn handle_field_access(&mut self, lhs: &hir::Expr, name: ast::Name) { | |||
| match self.tcx.expr_ty_adjusted(lhs).sty { | |||
| ty::TyStruct(def, _) | ty::TyUnion(def, _) => { | |||
| ty::TyAdt(def, _) => { | |||
| self.insert_def_id(def.struct_variant().field_named(name).did); | |||
There was a problem hiding this comment.
What happens here if sty here was a TyEnum previously?
There was a problem hiding this comment.
struct_variant() reports another span_bug!
|
Updated, comments addressed. |
|
@bors r+ |
|
📌 Commit 553d5f0 has been approved by |
bors
added a commit
that referenced
this pull request
Sep 9, 2016
Refactor `TyStruct`/`TyEnum`/`TyUnion` into `TyAdt` r? @eddyb
This was referenced Sep 9, 2016
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
r? @eddyb