nyaaaaaaa

Author: lcnr

compiler/rustc_data_structures/src/lib.rs

@@ -10,6 +10,7 @@
 #![allow(internal_features)]
 #![allow(rustc::default_hash_types)]
 #![allow(rustc::potential_query_instability)]
+#![cfg_attr(not(bootstrap), feature(move_trait))]
 #![deny(unsafe_op_in_unsafe_fn)]
 #![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
 #![doc(rust_logo)]

compiler/rustc_middle/src/ty/context.rs

@@ -1506,6 +1506,7 @@ unsafe impl DynSync for TyCtxt<'_> {}
 fn _assert_tcx_fields() {
     sync::assert_dyn_sync::<&'_ GlobalCtxt<'_>>();
     sync::assert_dyn_send::<&'_ GlobalCtxt<'_>>();
+
 }
 
 impl<'tcx> Deref for TyCtxt<'tcx> {

compiler/rustc_trait_selection/src/traits/select/mod.rs

@@ -1884,6 +1884,20 @@ impl<'tcx> SelectionContext<'_, 'tcx> {
             break;
         }
 
+        if is_default_auto_trait {
+            // Need to prefer alias-bound over env candidates.
+            let alias_bound = candidates
+                .iter()
+                .filter_map(|c| if let ProjectionCandidate(i) = c.candidate { Some(i) } else { None })
+                .try_reduce(|c1, c2| if has_non_region_infer { None } else { Some(c1.min(c2)) });
+            match alias_bound {
+                Some(Some(index)) => return Some(ProjectionCandidate(index)),
+                Some(None) => {}
+                None => return None,
+            }
+
+        }
+
         // The next highest priority is for non-global where-bounds. However, while we don't
         // prefer global where-clauses here, we do bail with ambiguity when encountering both
         // a global and a non-global where-clause.

library/core/src/marker.rs

@@ -1384,8 +1384,8 @@ pub unsafe auto trait Move {
 marker_impls! {
     #[unstable(feature = "move_trait", issue = "none")]
     unsafe Move for
-        {T: ?Sized + PointeeSized} *const T,
-        {T: ?Sized + PointeeSized} *mut T,
-        {T: ?Sized + PointeeSized} &T,
-        {T: ?Sized + PointeeSized} &mut T,
+        {T: ?Sized + PointeeSized + ?Move} *const T,
+        {T: ?Sized + PointeeSized + ?Move} *mut T,
+        {T: ?Sized + PointeeSized + ?Move} &T,
+        {T: ?Sized + PointeeSized + ?Move} &mut T,
 }