Reference patterns should use PartialEq for figuring out the matching logic

Author: oli-obk

src/librustc_mir/build/matches/test.rs

@@ -312,15 +312,11 @@ impl<'a, 'gcx, 'tcx> Builder<'a, 'gcx, 'tcx> {
                     })
                 };
 
-                // Use PartialEq::eq for &str and &[u8] slices, instead of BinOp::Eq.
+                // Use PartialEq::eq for references, instead of BinOp::Eq.
                 let fail = self.cfg.start_new_block();
                 let str_or_bytestr = ty
                     .builtin_deref(true, ty::NoPreference)
-                    .and_then(|tam| match tam.ty.sty {
-                        ty::TyStr => Some(tam.ty),
-                        ty::TySlice(inner) if inner == self.hir.tcx().types.u8 => Some(tam.ty),
-                        _ => None,
-                    });
+                    .map(|tam| tam.ty);
                 if let Some(ty) = str_or_bytestr {
                     let eq_def_id = self.hir.tcx().lang_items().eq_trait().unwrap();
                     let (mty, method) = self.hir.trait_method(eq_def_id, "eq", ty, &[ty]);

src/test/ui/const-expr-addr-operator.stderr

@@ -1,23 +0,0 @@
-warning: constant evaluation error
-  --> $DIR/const-expr-addr-operator.rs:17:5
-   |
-17 | /     assert_eq!(0, match &22 {
-18 | |         X => 0,
-19 | |         _ => 1,
-20 | |     });
-   | |_______^ machine error: "Pointer arithmetic or comparison" needs an rfc before being allowed inside constants
-   |
-   = note: #[warn(const_err)] on by default
-note: inside call to main
-  --> $DIR/const-expr-addr-operator.rs:14:1
-   |
-14 | / pub fn main() {
-15 | |     // Constant of generic type (int)
-16 | |     const X: &'static u32 = &22;
-17 | |     assert_eq!(0, match &22 {
-...  |
-20 | |     });
-21 | | }
-   | |_^
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
-