diff options
| author | bors <bors@rust-lang.org> | 2016-08-27 03:07:48 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-27 03:07:48 -0700 |
| commit | 099b9fdb1a170b57ffd7174b3c3042cc86b7fe91 (patch) | |
| tree | aa3b27019254450634a4fea8583e7cc70d7b7190 /src/librustc_mir/transform | |
| parent | 6b74503aa4f2fb4035d9adef9391e9b9658c57ad (diff) | |
| parent | 668d63132e23999f5a74fe65c8c0590a4d9ca215 (diff) | |
| download | rust-099b9fdb1a170b57ffd7174b3c3042cc86b7fe91.tar.gz rust-099b9fdb1a170b57ffd7174b3c3042cc86b7fe91.zip | |
Auto merge of #36030 - Manishearth:rollup, r=Manishearth
Rollup of 7 pull requests - Successful merges: #35124, #35877, #35953, #36002, #36004, #36005, #36014 - Failed merges:
Diffstat (limited to 'src/librustc_mir/transform')
| -rw-r--r-- | src/librustc_mir/transform/qualify_consts.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_mir/transform/qualify_consts.rs b/src/librustc_mir/transform/qualify_consts.rs index 840befe603e..9e076851bc3 100644 --- a/src/librustc_mir/transform/qualify_consts.rs +++ b/src/librustc_mir/transform/qualify_consts.rs @@ -540,7 +540,7 @@ impl<'a, 'tcx> Visitor<'tcx> for Qualifier<'a, 'tcx, 'tcx> { if let Literal::Item { def_id, substs } = constant.literal { // Don't peek inside generic (associated) constants. - if !substs.types.is_empty() { + if substs.types().next().is_some() { self.add_type(constant.ty); } else { let qualif = qualify_const_item_cached(self.tcx, |