diff options
| author | bors <bors@rust-lang.org> | 2015-02-03 14:56:32 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-02-03 14:56:32 +0000 |
| commit | 3b2ed14906fd9f9daa27cc7d1dad263d2f5ff450 (patch) | |
| tree | e6ff67e4c881eaa75db3891b1f72e50549b78ab8 | |
| parent | 3d072a193bfcb76206aab576049e696d6d8db25d (diff) | |
| parent | a3d2d35fcbdc4ef5afc1fff2cc6d5ba34004cef4 (diff) | |
| download | rust-3b2ed14906fd9f9daa27cc7d1dad263d2f5ff450.tar.gz rust-3b2ed14906fd9f9daa27cc7d1dad263d2f5ff450.zip | |
Auto merge of #21877 - dotdash:less_auto_deref, r=alexcrichton
| -rw-r--r-- | src/librustc_trans/trans/expr.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/librustc_trans/trans/expr.rs b/src/librustc_trans/trans/expr.rs index bed43a5c838..689d0c231b5 100644 --- a/src/librustc_trans/trans/expr.rs +++ b/src/librustc_trans/trans/expr.rs @@ -194,7 +194,8 @@ fn apply_adjustments<'blk, 'tcx>(bcx: Block<'blk, 'tcx>, // a different region or mutability, but we don't care here. It might // also be just in case we need to unsize. But if there are no nested // adjustments then it should be a no-op). - Some(ty::AutoPtr(_, _, None)) if adj.autoderefs == 1 => { + Some(ty::AutoPtr(_, _, None)) | + Some(ty::AutoUnsafe(_, None)) if adj.autoderefs == 1 => { match datum.ty.sty { // Don't skip a conversion from Box<T> to &T, etc. ty::ty_rptr(..) => { |