about summary refs log tree commit diff
path: root/src/librustc_passes
diff options
context:
space:
mode:
authorAriel Ben-Yehuda <arielb1@mail.tau.ac.il>2016-02-11 18:31:20 +0200
committerAriel Ben-Yehuda <ariel.byd@gmail.com>2016-02-20 01:54:58 +0200
commit76608c8e0a09687e485b8a1eb0b47156ac54a7f3 (patch)
tree94eb418ca25061d089871bdacc4db32175354d3f /src/librustc_passes
parent6f633ef128335e11e9903f647c6a6150f3a714d1 (diff)
downloadrust-76608c8e0a09687e485b8a1eb0b47156ac54a7f3.tar.gz
rust-76608c8e0a09687e485b8a1eb0b47156ac54a7f3.zip
make *mut T -> *const T a coercion
rather than being implicit quasi-subtyping. Nothing good can come out
of quasi-subtyping.
Diffstat (limited to 'src/librustc_passes')
-rw-r--r--src/librustc_passes/consts.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/librustc_passes/consts.rs b/src/librustc_passes/consts.rs
index ee6003f713e..b0d459063ef 100644
--- a/src/librustc_passes/consts.rs
+++ b/src/librustc_passes/consts.rs
@@ -768,7 +768,8 @@ fn check_adjustments<'a, 'tcx>(v: &mut CheckCrateVisitor<'a, 'tcx>, e: &hir::Exp
     match v.tcx.tables.borrow().adjustments.get(&e.id) {
         None |
         Some(&ty::adjustment::AdjustReifyFnPointer) |
-        Some(&ty::adjustment::AdjustUnsafeFnPointer) => {}
+        Some(&ty::adjustment::AdjustUnsafeFnPointer) |
+        Some(&ty::adjustment::AdjustMutToConstPointer) => {}
 
         Some(&ty::adjustment::AdjustDerefRef(
             ty::adjustment::AutoDerefRef { autoderefs, .. }