Merge ref 'f57b9e6f565a' from rust-lang/rust

Pull recent changes from https://github.com/rust-lang/rust via Josh.
Upstream ref: f57b9e6
Filtered ref: dd835ad11d6c5cea520a087bb620e3643e2dbf0f
Upstream diff: e8f3cfc...f57b9e6
This merge was created using https://github.com/rust-lang/josh-sync.

Author: The Miri Cronjob Bot

compiler/rustc_codegen_ssa/src/back/metadata.rs

@@ -330,14 +330,12 @@ pub(super) fn elf_e_flags(architecture: Architecture, sess: &Session) -> u32 {
 letmut e_flags:u32 = 0x0;
 
 // Check if compression is enabled
-// `unstable_target_features` is used here because "zca" is gated behind riscv_target_feature.
-if sess.unstable_target_features.contains(&sym::zca){
+if sess.target_features.contains(&sym::zca){
  e_flags |= elf::EF_RISCV_RVC;
 }
 
 // Check if RVTSO is enabled
-// `unstable_target_features` is used here because "ztso" is gated behind riscv_target_feature.
-if sess.unstable_target_features.contains(&sym::ztso){
+if sess.target_features.contains(&sym::ztso){
  e_flags |= elf::EF_RISCV_TSO;
 }
 

compiler/rustc_hir/src/def.rs

@@ -563,29 +563,6 @@ pub enum Res<Id = hir::HirId> {
 /// to get the underlying type.
 alias_to:DefId,
 
-/// Whether the `Self` type is disallowed from mentioning generics (i.e. when used in an
-/// anonymous constant).
-///
-/// HACK(min_const_generics): self types also have an optional requirement to **not**
-/// mention any generic parameters to allow the following with `min_const_generics`:
-/// ```
-/// # struct Foo;
-/// impl Foo { fn test() -> [u8; size_of::<Self>()] { todo!() } }
-///
-/// struct Bar([u8; baz::<Self>()]);
-/// const fn baz<T>() -> usize { 10 }
-/// ```
-/// We do however allow `Self` in repeat expression even if it is generic to not break code
-/// which already works on stable while causing the `const_evaluatable_unchecked` future
-/// compat lint:
-/// ```
-/// fn foo<T>() {
-/// let _bar = [1_u8; size_of::<*mut T>()];
-/// }
-/// ```
-// FIXME(generic_const_exprs): Remove this bodge once that feature is stable.
-forbid_generic:bool,
-
 /// Is this within an `impl Foo for bar`?
 is_trait_impl:bool,
 },
@@ -910,8 +887,8 @@ impl<Id> Res<Id> {
 Res::PrimTy(id) => Res::PrimTy(id),
 Res::Local(id) => Res::Local(map(id)),
 Res::SelfTyParam{ trait_ } => Res::SelfTyParam{ trait_ },
-Res::SelfTyAlias{ alias_to,forbid_generic,is_trait_impl } => {
-Res::SelfTyAlias{ alias_to,forbid_generic,is_trait_impl }
+Res::SelfTyAlias{ alias_to, is_trait_impl } => {
+Res::SelfTyAlias{ alias_to, is_trait_impl }
 }
 Res::ToolMod => Res::ToolMod,
 Res::NonMacroAttr(attr_kind) => Res::NonMacroAttr(attr_kind),
@@ -926,8 +903,8 @@ impl<Id> Res<Id> {
 Res::PrimTy(id) => Res::PrimTy(id),
 Res::Local(id) => Res::Local(map(id)?),
 Res::SelfTyParam{ trait_ } => Res::SelfTyParam{ trait_ },
-Res::SelfTyAlias{ alias_to,forbid_generic,is_trait_impl } => {
-Res::SelfTyAlias{ alias_to,forbid_generic,is_trait_impl }
+Res::SelfTyAlias{ alias_to, is_trait_impl } => {
+Res::SelfTyAlias{ alias_to, is_trait_impl }
 }
 Res::ToolMod => Res::ToolMod,
 Res::NonMacroAttr(attr_kind) => Res::NonMacroAttr(attr_kind),

compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs

@@ -2149,7 +2149,7 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
 );
 self.check_param_uses_if_mcg(tcx.types.self_param, span,false)
 }
-Res::SelfTyAlias{alias_to: def_id,forbid_generic: _,.. } => {
+Res::SelfTyAlias{alias_to: def_id, .. } => {
 // `Self` in impl (we know the concrete type).
 assert_eq!(opt_self_ty,None);
 // Try to evaluate any array length constants.

compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs

@@ -559,6 +559,15 @@ pub(in crate::rmeta) fn provide(providers: &mut Providers) {
 .filter_map(|(cnum, data)| data.used().then_some(cnum)),
 )
 },
+duplicate_crate_names: |tcx,c:CrateNum| {
+let name = tcx.crate_name(c);
+ tcx.arena.alloc_from_iter(
+ tcx.crates(())
+.into_iter()
+.filter(|k| tcx.crate_name(**k) == name && **k != c)
+.map(|c| *c),
+)
+},
  ..providers.queries
 };
 provide_extern(&mut providers.extern_queries);

compiler/rustc_middle/src/query/mod.rs

@@ -2334,6 +2334,7 @@ rustc_queries! {
  eval_always
  desc {"fetching all foreign CrateNum instances"}
 }
+
 // Crates that are loaded non-speculatively (not for diagnostics or doc links).
 // FIXME: This is currently only used for collecting lang items, but should be used instead of
 // `crates` in most other cases too.
@@ -2342,6 +2343,14 @@ rustc_queries! {
  desc {"fetching `CrateNum`s for all crates loaded non-speculatively"}
 }
 
+/// All crates that share the same name as crate `c`.
+///
+/// This normally occurs when multiple versions of the same dependency are present in the
+/// dependency tree.
+ query duplicate_crate_names(c:CrateNum) -> &'tcx [CrateNum]{
+ desc {"fetching `CrateNum`s with same name as `{c:?}`"}
+}
+
 /// A list of all traits in a crate, used by rustdoc and error reporting.
  query traits(_:CrateNum) -> &'tcx [DefId]{
  desc {"fetching all traits in a crate"}

compiler/rustc_resolve/src/ident.rs

@@ -1286,7 +1286,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
 &mutself,
 rib_index:usize,
 rib_ident:Ident,
-mutres:Res,
+res:Res,
 finalize:Option<Span>,
 original_rib_ident_def:Ident,
 all_ribs:&[Rib<'ra>],
@@ -1439,44 +1439,28 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
 }
 
 RibKind::ConstantItem(trivial, _) => {
-ifletConstantHasGenerics::No(cause) = trivial {
-// HACK(min_const_generics): If we encounter `Self` in an anonymous
-// constant we can't easily tell if it's generic at this stage, so
-// we instead remember this and then enforce the self type to be
-// concrete later on.
-ifletRes::SelfTyAlias{
-alias_to: def,
-forbid_generic: _,
- is_trait_impl,
-} = res
-{
- res = Res::SelfTyAlias{
-alias_to: def,
-forbid_generic:true,
- is_trait_impl,
-}
-}else{
-ifletSome(span) = finalize {
-let error = match cause {
-NoConstantGenericsReason::IsEnumDiscriminant => {
-ResolutionError::ParamInEnumDiscriminant{
-name: rib_ident.name,
-param_kind:ParamKindInEnumDiscriminant::Type,
-}
+ifletConstantHasGenerics::No(cause) = trivial
+ && !matches!(res,Res::SelfTyAlias{ .. })
+{
+ifletSome(span) = finalize {
+let error = match cause {
+NoConstantGenericsReason::IsEnumDiscriminant => {
+ResolutionError::ParamInEnumDiscriminant{
+name: rib_ident.name,
+param_kind:ParamKindInEnumDiscriminant::Type,
 }
-NoConstantGenericsReason::NonTrivialConstArg => {
-ResolutionError::ParamInNonTrivialAnonConst{
-name: rib_ident.name,
-param_kind:
-ParamKindInNonTrivialAnonConst::Type,
-}
+}
+NoConstantGenericsReason::NonTrivialConstArg => {
+ResolutionError::ParamInNonTrivialAnonConst{
+name: rib_ident.name,
+param_kind:ParamKindInNonTrivialAnonConst::Type,
 }
-};
-let _:ErrorGuaranteed = self.report_error(span, error);
-}
-
-returnRes::Err;
+}
+};
+let _:ErrorGuaranteed = self.report_error(span, error);
 }
+
+returnRes::Err;
 }
 
 continue;

compiler/rustc_resolve/src/late.rs

@@ -2655,11 +2655,7 @@ impl<'a, 'ast, 'ra, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
  |this| {
 let item_def_id = this.r.local_def_id(item.id).to_def_id();
  this.with_self_rib(
-Res::SelfTyAlias{
-alias_to: item_def_id,
-forbid_generic:false,
-is_trait_impl:false,
-},
+Res::SelfTyAlias{alias_to: item_def_id,is_trait_impl:false},
  |this| {
  visit::walk_item(this, item);
 },
@@ -3368,8 +3364,7 @@ impl<'a, 'ast, 'ra, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
 let item_def_id = item_def_id.to_def_id();
 let res = Res::SelfTyAlias{
 alias_to: item_def_id,
-forbid_generic:false,
-is_trait_impl: trait_id.is_some()
+is_trait_impl: trait_id.is_some(),
 };
  this.with_self_rib(res, |this| {
 ifletSome(of_trait) = of_trait {

compiler/rustc_span/src/symbol.rs

@@ -1788,6 +1788,8 @@ symbols! {
  ptr_slice_from_raw_parts_mut,
  ptr_swap,
  ptr_swap_nonoverlapping,
+ ptr_without_provenance,
+ ptr_without_provenance_mut,
  ptr_write,
  ptr_write_bytes,
  ptr_write_unaligned,

compiler/rustc_target/src/target_features.rs

@@ -588,7 +588,7 @@ const NVPTX_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
 staticRISCV_FEATURES:&[(&str,Stability,ImpliedFeatures)] = &[
 // tidy-alphabetical-start
 ("a",Stable,&["zaamo","zalrsc"]),
-("b",Unstable(sym::riscv_target_feature),&["zba","zbb","zbs"]),
+("b",Stable,&["zba","zbb","zbs"]),
 ("c",Stable,&["zca"]),
 ("d",Unstable(sym::riscv_target_feature),&["f"]),
 ("e",Unstable(sym::riscv_target_feature),&[]),
@@ -646,24 +646,24 @@ static RISCV_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
 ("unaligned-scalar-mem",Unstable(sym::riscv_target_feature),&[]),
 ("unaligned-vector-mem",Unstable(sym::riscv_target_feature),&[]),
 ("v",Unstable(sym::riscv_target_feature),&["zvl128b","zve64d"]),
-("za64rs",Unstable(sym::riscv_target_feature),&["za128rs"]),// Za64rs ⊃ Za128rs
-("za128rs",Unstable(sym::riscv_target_feature),&[]),
-("zaamo",Unstable(sym::riscv_target_feature),&[]),
-("zabha",Unstable(sym::riscv_target_feature),&["zaamo"]),
-("zacas",Unstable(sym::riscv_target_feature),&["zaamo"]),
-("zalrsc",Unstable(sym::riscv_target_feature),&[]),
-("zama16b",Unstable(sym::riscv_target_feature),&[]),
-("zawrs",Unstable(sym::riscv_target_feature),&[]),
+("za64rs",Stable,&["za128rs"]),// Za64rs ⊃ Za128rs
+("za128rs",Stable,&[]),
+("zaamo",Stable,&[]),
+("zabha",Stable,&["zaamo"]),
+("zacas",Stable,&["zaamo"]),
+("zalrsc",Stable,&[]),
+("zama16b",Stable,&[]),
+("zawrs",Stable,&[]),
 ("zba",Stable,&[]),
 ("zbb",Stable,&[]),
 ("zbc",Stable,&["zbkc"]),// Zbc ⊃ Zbkc
 ("zbkb",Stable,&[]),
 ("zbkc",Stable,&[]),
 ("zbkx",Stable,&[]),
 ("zbs",Stable,&[]),
-("zca",Unstable(sym::riscv_target_feature),&[]),
-("zcb",Unstable(sym::riscv_target_feature),&["zca"]),
-("zcmop",Unstable(sym::riscv_target_feature),&["zca"]),
+("zca",Stable,&[]),
+("zcb",Stable,&["zca"]),
+("zcmop",Stable,&["zca"]),
 ("zdinx",Unstable(sym::riscv_target_feature),&["zfinx"]),
 ("zfa",Unstable(sym::riscv_target_feature),&["f"]),
 ("zfbfmin",Unstable(sym::riscv_target_feature),&["f"]),// and a subset of Zfhmin
@@ -672,22 +672,22 @@ static RISCV_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
 ("zfinx",Unstable(sym::riscv_target_feature),&["zicsr"]),
 ("zhinx",Unstable(sym::riscv_target_feature),&["zhinxmin"]),
 ("zhinxmin",Unstable(sym::riscv_target_feature),&["zfinx"]),
-("zic64b",Unstable(sym::riscv_target_feature),&[]),
-("zicbom",Unstable(sym::riscv_target_feature),&[]),
-("zicbop",Unstable(sym::riscv_target_feature),&[]),
-("zicboz",Unstable(sym::riscv_target_feature),&[]),
-("ziccamoa",Unstable(sym::riscv_target_feature),&[]),
-("ziccif",Unstable(sym::riscv_target_feature),&[]),
-("zicclsm",Unstable(sym::riscv_target_feature),&[]),
-("ziccrse",Unstable(sym::riscv_target_feature),&[]),
-("zicntr",Unstable(sym::riscv_target_feature),&["zicsr"]),
-("zicond",Unstable(sym::riscv_target_feature),&[]),
-("zicsr",Unstable(sym::riscv_target_feature),&[]),
-("zifencei",Unstable(sym::riscv_target_feature),&[]),
-("zihintntl",Unstable(sym::riscv_target_feature),&[]),
-("zihintpause",Unstable(sym::riscv_target_feature),&[]),
-("zihpm",Unstable(sym::riscv_target_feature),&["zicsr"]),
-("zimop",Unstable(sym::riscv_target_feature),&[]),
+("zic64b",Stable,&[]),
+("zicbom",Stable,&[]),
+("zicbop",Stable,&[]),
+("zicboz",Stable,&[]),
+("ziccamoa",Stable,&[]),
+("ziccif",Stable,&[]),
+("zicclsm",Stable,&[]),
+("ziccrse",Stable,&[]),
+("zicntr",Stable,&["zicsr"]),
+("zicond",Stable,&[]),
+("zicsr",Stable,&[]),
+("zifencei",Stable,&[]),
+("zihintntl",Stable,&[]),
+("zihintpause",Stable,&[]),
+("zihpm",Stable,&["zicsr"]),
+("zimop",Stable,&[]),
 ("zk",Stable,&["zkn","zkr","zkt"]),
 ("zkn",Stable,&["zbkb","zbkc","zbkx","zkne","zknd","zknh"]),
 ("zknd",Stable,&["zkne_or_zknd"]),
@@ -699,7 +699,7 @@ static RISCV_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
 ("zksed",Stable,&[]),
 ("zksh",Stable,&[]),
 ("zkt",Stable,&[]),
-("ztso",Unstable(sym::riscv_target_feature),&[]),
+("ztso",Stable,&[]),
 ("zvbb",Unstable(sym::riscv_target_feature),&["zvkb"]),// Zvbb ⊃ Zvkb
 ("zvbc",Unstable(sym::riscv_target_feature),&["zve64x"]),
 ("zve32f",Unstable(sym::riscv_target_feature),&["zve32x","f"]),

compiler/rustc_trait_selection/src/error_reporting/traits/fulfillment_errors.rs

@@ -33,6 +33,7 @@ use rustc_middle::ty::{
 TypeVisitableExt,Upcast,
 };
 use rustc_middle::{bug, span_bug};
+use rustc_span::def_id::CrateNum;
 use rustc_span::{BytePos,DUMMY_SP,STDLIB_STABLE_CRATES,Span,Symbol, sym};
 use tracing::{debug, instrument};
 
@@ -1287,10 +1288,6 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
 self.tcx.def_span(def.did()),
 format!("`{self_ty}` needs to implement `From<{ty}>`"),
 );
- err.span_note(
-self.tcx.def_span(found.did()),
-format!("alternatively, `{ty}` needs to implement `Into<{self_ty}>`"),
-);
 }
 (ty::Adt(def, _),None)if def.did().is_local() => {
 let trait_path = self.tcx.short_string(
@@ -2172,6 +2169,13 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
 self.suggest_function_pointers_impl(None,&exp_found, err);
 }
 
+iflet ty::Adt(def, _) = trait_pred.self_ty().skip_binder().peel_refs().kind()
+ && let crates = self.tcx.duplicate_crate_names(def.did().krate)
+ && !crates.is_empty()
+{
+self.note_two_crate_versions(def.did().krate,MultiSpan::new(), err);
+ err.help("you can use `cargo tree` to explore your dependency tree");
+}
 true
 })
 }){
@@ -2282,6 +2286,14 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
 }
 ));
 }
+
+iflet ty::Adt(def, _) = trait_pred.self_ty().skip_binder().peel_refs().kind()
+ && let crates = self.tcx.duplicate_crate_names(def.did().krate)
+ && !crates.is_empty()
+{
+self.note_two_crate_versions(def.did().krate,MultiSpan::new(), err);
+ err.help("you can use `cargo tree` to explore your dependency tree");
+}
 true
 };
 
@@ -2445,11 +2457,11 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
 
 pubfnnote_two_crate_versions(
 &self,
-did:DefId,
+krate:CrateNum,
 sp:implInto<MultiSpan>,
 err:&mutDiag<'_>,
 ){
-let crate_name = self.tcx.crate_name(did.krate);
+let crate_name = self.tcx.crate_name(krate);
 let crate_msg = format!(
 "there are multiple different versions of crate `{crate_name}` in the dependency graph"
 );
@@ -2514,7 +2526,7 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
 
 for(similar_item, _)in similar_items {
  err.span_help(self.tcx.def_span(similar_item),"item with same name found");
-self.note_two_crate_versions(similar_item,MultiSpan::new(), err);
+self.note_two_crate_versions(similar_item.krate,MultiSpan::new(), err);
 }
 }
 

compiler/rustc_codegen_ssa/src/back/metadata.rs

@@ -330,14 +330,12 @@ pub(super) fn elf_e_flags(architecture: Architecture, sess: &Session) -> u32 {
 letmut e_flags:u32 = 0x0;
 
 // Check if compression is enabled
-// `unstable_target_features` is used here because "zca" is gated behind riscv_target_feature.
-if sess.unstable_target_features.contains(&sym::zca){
+if sess.target_features.contains(&sym::zca){
  e_flags |= elf::EF_RISCV_RVC;
 }
 
 // Check if RVTSO is enabled
-// `unstable_target_features` is used here because "ztso" is gated behind riscv_target_feature.
-if sess.unstable_target_features.contains(&sym::ztso){
+if sess.target_features.contains(&sym::ztso){
  e_flags |= elf::EF_RISCV_TSO;
 }
 

compiler/rustc_hir/src/def.rs

@@ -563,29 +563,6 @@ pub enum Res<Id = hir::HirId> {
 /// to get the underlying type.
 alias_to:DefId,
 
-/// Whether the `Self` type is disallowed from mentioning generics (i.e. when used in an
-/// anonymous constant).
-///
-/// HACK(min_const_generics): self types also have an optional requirement to **not**
-/// mention any generic parameters to allow the following with `min_const_generics`:
-/// ```
-/// # struct Foo;
-/// impl Foo { fn test() -> [u8; size_of::<Self>()] { todo!() } }
-///
-/// struct Bar([u8; baz::<Self>()]);
-/// const fn baz<T>() -> usize { 10 }
-/// ```
-/// We do however allow `Self` in repeat expression even if it is generic to not break code
-/// which already works on stable while causing the `const_evaluatable_unchecked` future
-/// compat lint:
-/// ```
-/// fn foo<T>() {
-/// let _bar = [1_u8; size_of::<*mut T>()];
-/// }
-/// ```
-// FIXME(generic_const_exprs): Remove this bodge once that feature is stable.
-forbid_generic:bool,
-
 /// Is this within an `impl Foo for bar`?
 is_trait_impl:bool,
 },
@@ -910,8 +887,8 @@ impl<Id> Res<Id> {
 Res::PrimTy(id) => Res::PrimTy(id),
 Res::Local(id) => Res::Local(map(id)),
 Res::SelfTyParam{ trait_ } => Res::SelfTyParam{ trait_ },
-Res::SelfTyAlias{ alias_to,forbid_generic,is_trait_impl } => {
-Res::SelfTyAlias{ alias_to,forbid_generic,is_trait_impl }
+Res::SelfTyAlias{ alias_to, is_trait_impl } => {
+Res::SelfTyAlias{ alias_to, is_trait_impl }
 }
 Res::ToolMod => Res::ToolMod,
 Res::NonMacroAttr(attr_kind) => Res::NonMacroAttr(attr_kind),
@@ -926,8 +903,8 @@ impl<Id> Res<Id> {
 Res::PrimTy(id) => Res::PrimTy(id),
 Res::Local(id) => Res::Local(map(id)?),
 Res::SelfTyParam{ trait_ } => Res::SelfTyParam{ trait_ },
-Res::SelfTyAlias{ alias_to,forbid_generic,is_trait_impl } => {
-Res::SelfTyAlias{ alias_to,forbid_generic,is_trait_impl }
+Res::SelfTyAlias{ alias_to, is_trait_impl } => {
+Res::SelfTyAlias{ alias_to, is_trait_impl }
 }
 Res::ToolMod => Res::ToolMod,
 Res::NonMacroAttr(attr_kind) => Res::NonMacroAttr(attr_kind),

compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs

@@ -2149,7 +2149,7 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
 );
 self.check_param_uses_if_mcg(tcx.types.self_param, span,false)
 }
-Res::SelfTyAlias{alias_to: def_id,forbid_generic: _,.. } => {
+Res::SelfTyAlias{alias_to: def_id, .. } => {
 // `Self` in impl (we know the concrete type).
 assert_eq!(opt_self_ty,None);
 // Try to evaluate any array length constants.

compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs

@@ -559,6 +559,15 @@ pub(in crate::rmeta) fn provide(providers: &mut Providers) {
 .filter_map(|(cnum, data)| data.used().then_some(cnum)),
 )
 },
+duplicate_crate_names: |tcx,c:CrateNum| {
+let name = tcx.crate_name(c);
+ tcx.arena.alloc_from_iter(
+ tcx.crates(())
+.into_iter()
+.filter(|k| tcx.crate_name(**k) == name && **k != c)
+.map(|c| *c),
+)
+},
  ..providers.queries
 };
 provide_extern(&mut providers.extern_queries);

compiler/rustc_middle/src/query/mod.rs

@@ -2334,6 +2334,7 @@ rustc_queries! {
  eval_always
  desc {"fetching all foreign CrateNum instances"}
 }
+
 // Crates that are loaded non-speculatively (not for diagnostics or doc links).
 // FIXME: This is currently only used for collecting lang items, but should be used instead of
 // `crates` in most other cases too.
@@ -2342,6 +2343,14 @@ rustc_queries! {
  desc {"fetching `CrateNum`s for all crates loaded non-speculatively"}
 }
 
+/// All crates that share the same name as crate `c`.
+///
+/// This normally occurs when multiple versions of the same dependency are present in the
+/// dependency tree.
+ query duplicate_crate_names(c:CrateNum) -> &'tcx [CrateNum]{
+ desc {"fetching `CrateNum`s with same name as `{c:?}`"}
+}
+
 /// A list of all traits in a crate, used by rustdoc and error reporting.
  query traits(_:CrateNum) -> &'tcx [DefId]{
  desc {"fetching all traits in a crate"}

compiler/rustc_resolve/src/ident.rs

@@ -1286,7 +1286,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
 &mutself,
 rib_index:usize,
 rib_ident:Ident,
-mutres:Res,
+res:Res,
 finalize:Option<Span>,
 original_rib_ident_def:Ident,
 all_ribs:&[Rib<'ra>],
@@ -1439,44 +1439,28 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
 }
 
 RibKind::ConstantItem(trivial, _) => {
-ifletConstantHasGenerics::No(cause) = trivial {
-// HACK(min_const_generics): If we encounter `Self` in an anonymous
-// constant we can't easily tell if it's generic at this stage, so
-// we instead remember this and then enforce the self type to be
-// concrete later on.
-ifletRes::SelfTyAlias{
-alias_to: def,
-forbid_generic: _,
- is_trait_impl,
-} = res
-{
- res = Res::SelfTyAlias{
-alias_to: def,
-forbid_generic:true,
- is_trait_impl,
-}
-}else{
-ifletSome(span) = finalize {
-let error = match cause {
-NoConstantGenericsReason::IsEnumDiscriminant => {
-ResolutionError::ParamInEnumDiscriminant{
-name: rib_ident.name,
-param_kind:ParamKindInEnumDiscriminant::Type,
-}
+ifletConstantHasGenerics::No(cause) = trivial
+ && !matches!(res,Res::SelfTyAlias{ .. })
+{
+ifletSome(span) = finalize {
+let error = match cause {
+NoConstantGenericsReason::IsEnumDiscriminant => {
+ResolutionError::ParamInEnumDiscriminant{
+name: rib_ident.name,
+param_kind:ParamKindInEnumDiscriminant::Type,
 }
-NoConstantGenericsReason::NonTrivialConstArg => {
-ResolutionError::ParamInNonTrivialAnonConst{
-name: rib_ident.name,
-param_kind:
-ParamKindInNonTrivialAnonConst::Type,
-}
+}
+NoConstantGenericsReason::NonTrivialConstArg => {
+ResolutionError::ParamInNonTrivialAnonConst{
+name: rib_ident.name,
+param_kind:ParamKindInNonTrivialAnonConst::Type,
 }
-};
-let _:ErrorGuaranteed = self.report_error(span, error);
-}
-
-returnRes::Err;
+}
+};
+let _:ErrorGuaranteed = self.report_error(span, error);
 }
+
+returnRes::Err;
 }
 
 continue;

compiler/rustc_resolve/src/late.rs

@@ -2655,11 +2655,7 @@ impl<'a, 'ast, 'ra, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
  |this| {
 let item_def_id = this.r.local_def_id(item.id).to_def_id();
  this.with_self_rib(
-Res::SelfTyAlias{
-alias_to: item_def_id,
-forbid_generic:false,
-is_trait_impl:false,
-},
+Res::SelfTyAlias{alias_to: item_def_id,is_trait_impl:false},
  |this| {
  visit::walk_item(this, item);
 },
@@ -3368,8 +3364,7 @@ impl<'a, 'ast, 'ra, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
 let item_def_id = item_def_id.to_def_id();
 let res = Res::SelfTyAlias{
 alias_to: item_def_id,
-forbid_generic:false,
-is_trait_impl: trait_id.is_some()
+is_trait_impl: trait_id.is_some(),
 };
  this.with_self_rib(res, |this| {
 ifletSome(of_trait) = of_trait {

compiler/rustc_span/src/symbol.rs

@@ -1788,6 +1788,8 @@ symbols! {
  ptr_slice_from_raw_parts_mut,
  ptr_swap,
  ptr_swap_nonoverlapping,
+ ptr_without_provenance,
+ ptr_without_provenance_mut,
  ptr_write,
  ptr_write_bytes,
  ptr_write_unaligned,

compiler/rustc_target/src/target_features.rs

@@ -588,7 +588,7 @@ const NVPTX_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
 staticRISCV_FEATURES:&[(&str,Stability,ImpliedFeatures)] = &[
 // tidy-alphabetical-start
 ("a",Stable,&["zaamo","zalrsc"]),
-("b",Unstable(sym::riscv_target_feature),&["zba","zbb","zbs"]),
+("b",Stable,&["zba","zbb","zbs"]),
 ("c",Stable,&["zca"]),
 ("d",Unstable(sym::riscv_target_feature),&["f"]),
 ("e",Unstable(sym::riscv_target_feature),&[]),
@@ -646,24 +646,24 @@ static RISCV_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
 ("unaligned-scalar-mem",Unstable(sym::riscv_target_feature),&[]),
 ("unaligned-vector-mem",Unstable(sym::riscv_target_feature),&[]),
 ("v",Unstable(sym::riscv_target_feature),&["zvl128b","zve64d"]),
-("za64rs",Unstable(sym::riscv_target_feature),&["za128rs"]),// Za64rs ⊃ Za128rs
-("za128rs",Unstable(sym::riscv_target_feature),&[]),
-("zaamo",Unstable(sym::riscv_target_feature),&[]),
-("zabha",Unstable(sym::riscv_target_feature),&["zaamo"]),
-("zacas",Unstable(sym::riscv_target_feature),&["zaamo"]),
-("zalrsc",Unstable(sym::riscv_target_feature),&[]),
-("zama16b",Unstable(sym::riscv_target_feature),&[]),
-("zawrs",Unstable(sym::riscv_target_feature),&[]),
+("za64rs",Stable,&["za128rs"]),// Za64rs ⊃ Za128rs
+("za128rs",Stable,&[]),
+("zaamo",Stable,&[]),
+("zabha",Stable,&["zaamo"]),
+("zacas",Stable,&["zaamo"]),
+("zalrsc",Stable,&[]),
+("zama16b",Stable,&[]),
+("zawrs",Stable,&[]),
 ("zba",Stable,&[]),
 ("zbb",Stable,&[]),
 ("zbc",Stable,&["zbkc"]),// Zbc ⊃ Zbkc
 ("zbkb",Stable,&[]),
 ("zbkc",Stable,&[]),
 ("zbkx",Stable,&[]),
 ("zbs",Stable,&[]),
-("zca",Unstable(sym::riscv_target_feature),&[]),
-("zcb",Unstable(sym::riscv_target_feature),&["zca"]),
-("zcmop",Unstable(sym::riscv_target_feature),&["zca"]),
+("zca",Stable,&[]),
+("zcb",Stable,&["zca"]),
+("zcmop",Stable,&["zca"]),
 ("zdinx",Unstable(sym::riscv_target_feature),&["zfinx"]),
 ("zfa",Unstable(sym::riscv_target_feature),&["f"]),
 ("zfbfmin",Unstable(sym::riscv_target_feature),&["f"]),// and a subset of Zfhmin
@@ -672,22 +672,22 @@ static RISCV_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
 ("zfinx",Unstable(sym::riscv_target_feature),&["zicsr"]),
 ("zhinx",Unstable(sym::riscv_target_feature),&["zhinxmin"]),
 ("zhinxmin",Unstable(sym::riscv_target_feature),&["zfinx"]),
-("zic64b",Unstable(sym::riscv_target_feature),&[]),
-("zicbom",Unstable(sym::riscv_target_feature),&[]),
-("zicbop",Unstable(sym::riscv_target_feature),&[]),
-("zicboz",Unstable(sym::riscv_target_feature),&[]),
-("ziccamoa",Unstable(sym::riscv_target_feature),&[]),
-("ziccif",Unstable(sym::riscv_target_feature),&[]),
-("zicclsm",Unstable(sym::riscv_target_feature),&[]),
-("ziccrse",Unstable(sym::riscv_target_feature),&[]),
-("zicntr",Unstable(sym::riscv_target_feature),&["zicsr"]),
-("zicond",Unstable(sym::riscv_target_feature),&[]),
-("zicsr",Unstable(sym::riscv_target_feature),&[]),
-("zifencei",Unstable(sym::riscv_target_feature),&[]),
-("zihintntl",Unstable(sym::riscv_target_feature),&[]),
-("zihintpause",Unstable(sym::riscv_target_feature),&[]),
-("zihpm",Unstable(sym::riscv_target_feature),&["zicsr"]),
-("zimop",Unstable(sym::riscv_target_feature),&[]),
+("zic64b",Stable,&[]),
+("zicbom",Stable,&[]),
+("zicbop",Stable,&[]),
+("zicboz",Stable,&[]),
+("ziccamoa",Stable,&[]),
+("ziccif",Stable,&[]),
+("zicclsm",Stable,&[]),
+("ziccrse",Stable,&[]),
+("zicntr",Stable,&["zicsr"]),
+("zicond",Stable,&[]),
+("zicsr",Stable,&[]),
+("zifencei",Stable,&[]),
+("zihintntl",Stable,&[]),
+("zihintpause",Stable,&[]),
+("zihpm",Stable,&["zicsr"]),
+("zimop",Stable,&[]),
 ("zk",Stable,&["zkn","zkr","zkt"]),
 ("zkn",Stable,&["zbkb","zbkc","zbkx","zkne","zknd","zknh"]),
 ("zknd",Stable,&["zkne_or_zknd"]),
@@ -699,7 +699,7 @@ static RISCV_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
 ("zksed",Stable,&[]),
 ("zksh",Stable,&[]),
 ("zkt",Stable,&[]),
-("ztso",Unstable(sym::riscv_target_feature),&[]),
+("ztso",Stable,&[]),
 ("zvbb",Unstable(sym::riscv_target_feature),&["zvkb"]),// Zvbb ⊃ Zvkb
 ("zvbc",Unstable(sym::riscv_target_feature),&["zve64x"]),
 ("zve32f",Unstable(sym::riscv_target_feature),&["zve32x","f"]),

compiler/rustc_trait_selection/src/error_reporting/traits/fulfillment_errors.rs

@@ -33,6 +33,7 @@ use rustc_middle::ty::{
 TypeVisitableExt,Upcast,
 };
 use rustc_middle::{bug, span_bug};
+use rustc_span::def_id::CrateNum;
 use rustc_span::{BytePos,DUMMY_SP,STDLIB_STABLE_CRATES,Span,Symbol, sym};
 use tracing::{debug, instrument};
 
@@ -1287,10 +1288,6 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
 self.tcx.def_span(def.did()),
 format!("`{self_ty}` needs to implement `From<{ty}>`"),
 );
- err.span_note(
-self.tcx.def_span(found.did()),
-format!("alternatively, `{ty}` needs to implement `Into<{self_ty}>`"),
-);
 }
 (ty::Adt(def, _),None)if def.did().is_local() => {
 let trait_path = self.tcx.short_string(
@@ -2172,6 +2169,13 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
 self.suggest_function_pointers_impl(None,&exp_found, err);
 }
 
+iflet ty::Adt(def, _) = trait_pred.self_ty().skip_binder().peel_refs().kind()
+ && let crates = self.tcx.duplicate_crate_names(def.did().krate)
+ && !crates.is_empty()
+{
+self.note_two_crate_versions(def.did().krate,MultiSpan::new(), err);
+ err.help("you can use `cargo tree` to explore your dependency tree");
+}
 true
 })
 }){
@@ -2282,6 +2286,14 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
 }
 ));
 }
+
+iflet ty::Adt(def, _) = trait_pred.self_ty().skip_binder().peel_refs().kind()
+ && let crates = self.tcx.duplicate_crate_names(def.did().krate)
+ && !crates.is_empty()
+{
+self.note_two_crate_versions(def.did().krate,MultiSpan::new(), err);
+ err.help("you can use `cargo tree` to explore your dependency tree");
+}
 true
 };
 
@@ -2445,11 +2457,11 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
 
 pubfnnote_two_crate_versions(
 &self,
-did:DefId,
+krate:CrateNum,
 sp:implInto<MultiSpan>,
 err:&mutDiag<'_>,
 ){
-let crate_name = self.tcx.crate_name(did.krate);
+let crate_name = self.tcx.crate_name(krate);
 let crate_msg = format!(
 "there are multiple different versions of crate `{crate_name}` in the dependency graph"
 );
@@ -2514,7 +2526,7 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
 
 for(similar_item, _)in similar_items {
  err.span_help(self.tcx.def_span(similar_item),"item with same name found");
-self.note_two_crate_versions(similar_item,MultiSpan::new(), err);
+self.note_two_crate_versions(similar_item.krate,MultiSpan::new(), err);
 }
 }
 

compiler/rustc_codegen_ssa/src/back/metadata.rs

@@ -330,14 +330,12 @@ pub(super) fn elf_e_flags(architecture: Architecture, sess: &Session) -> u32 {
 letmut e_flags:u32 = 0x0;
 
 // Check if compression is enabled
-// `unstable_target_features` is used here because "zca" is gated behind riscv_target_feature.
-if sess.unstable_target_features.contains(&sym::zca){
+if sess.target_features.contains(&sym::zca){
  e_flags |= elf::EF_RISCV_RVC;
 }
 
 // Check if RVTSO is enabled
-// `unstable_target_features` is used here because "ztso" is gated behind riscv_target_feature.
-if sess.unstable_target_features.contains(&sym::ztso){
+if sess.target_features.contains(&sym::ztso){
  e_flags |= elf::EF_RISCV_TSO;
 }
 

compiler/rustc_hir/src/def.rs

@@ -563,29 +563,6 @@ pub enum Res<Id = hir::HirId> {
 /// to get the underlying type.
 alias_to:DefId,
 
-/// Whether the `Self` type is disallowed from mentioning generics (i.e. when used in an
-/// anonymous constant).
-///
-/// HACK(min_const_generics): self types also have an optional requirement to **not**
-/// mention any generic parameters to allow the following with `min_const_generics`:
-/// ```
-/// # struct Foo;
-/// impl Foo { fn test() -> [u8; size_of::<Self>()] { todo!() } }
-///
-/// struct Bar([u8; baz::<Self>()]);
-/// const fn baz<T>() -> usize { 10 }
-/// ```
-/// We do however allow `Self` in repeat expression even if it is generic to not break code
-/// which already works on stable while causing the `const_evaluatable_unchecked` future
-/// compat lint:
-/// ```
-/// fn foo<T>() {
-/// let _bar = [1_u8; size_of::<*mut T>()];
-/// }
-/// ```
-// FIXME(generic_const_exprs): Remove this bodge once that feature is stable.
-forbid_generic:bool,
-
 /// Is this within an `impl Foo for bar`?
 is_trait_impl:bool,
 },
@@ -910,8 +887,8 @@ impl<Id> Res<Id> {
 Res::PrimTy(id) => Res::PrimTy(id),
 Res::Local(id) => Res::Local(map(id)),
 Res::SelfTyParam{ trait_ } => Res::SelfTyParam{ trait_ },
-Res::SelfTyAlias{ alias_to,forbid_generic,is_trait_impl } => {
-Res::SelfTyAlias{ alias_to,forbid_generic,is_trait_impl }
+Res::SelfTyAlias{ alias_to, is_trait_impl } => {
+Res::SelfTyAlias{ alias_to, is_trait_impl }
 }
 Res::ToolMod => Res::ToolMod,
 Res::NonMacroAttr(attr_kind) => Res::NonMacroAttr(attr_kind),
@@ -926,8 +903,8 @@ impl<Id> Res<Id> {
 Res::PrimTy(id) => Res::PrimTy(id),
 Res::Local(id) => Res::Local(map(id)?),
 Res::SelfTyParam{ trait_ } => Res::SelfTyParam{ trait_ },
-Res::SelfTyAlias{ alias_to,forbid_generic,is_trait_impl } => {
-Res::SelfTyAlias{ alias_to,forbid_generic,is_trait_impl }
+Res::SelfTyAlias{ alias_to, is_trait_impl } => {
+Res::SelfTyAlias{ alias_to, is_trait_impl }
 }
 Res::ToolMod => Res::ToolMod,
 Res::NonMacroAttr(attr_kind) => Res::NonMacroAttr(attr_kind),

compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs

@@ -2149,7 +2149,7 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
 );
 self.check_param_uses_if_mcg(tcx.types.self_param, span,false)
 }
-Res::SelfTyAlias{alias_to: def_id,forbid_generic: _,.. } => {
+Res::SelfTyAlias{alias_to: def_id, .. } => {
 // `Self` in impl (we know the concrete type).
 assert_eq!(opt_self_ty,None);
 // Try to evaluate any array length constants.

compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs

@@ -559,6 +559,15 @@ pub(in crate::rmeta) fn provide(providers: &mut Providers) {
 .filter_map(|(cnum, data)| data.used().then_some(cnum)),
 )
 },
+duplicate_crate_names: |tcx,c:CrateNum| {
+let name = tcx.crate_name(c);
+ tcx.arena.alloc_from_iter(
+ tcx.crates(())
+.into_iter()
+.filter(|k| tcx.crate_name(**k) == name && **k != c)
+.map(|c| *c),
+)
+},
  ..providers.queries
 };
 provide_extern(&mut providers.extern_queries);

compiler/rustc_middle/src/query/mod.rs

@@ -2334,6 +2334,7 @@ rustc_queries! {
  eval_always
  desc {"fetching all foreign CrateNum instances"}
 }
+
 // Crates that are loaded non-speculatively (not for diagnostics or doc links).
 // FIXME: This is currently only used for collecting lang items, but should be used instead of
 // `crates` in most other cases too.
@@ -2342,6 +2343,14 @@ rustc_queries! {
  desc {"fetching `CrateNum`s for all crates loaded non-speculatively"}
 }
 
+/// All crates that share the same name as crate `c`.
+///
+/// This normally occurs when multiple versions of the same dependency are present in the
+/// dependency tree.
+ query duplicate_crate_names(c:CrateNum) -> &'tcx [CrateNum]{
+ desc {"fetching `CrateNum`s with same name as `{c:?}`"}
+}
+
 /// A list of all traits in a crate, used by rustdoc and error reporting.
  query traits(_:CrateNum) -> &'tcx [DefId]{
  desc {"fetching all traits in a crate"}

compiler/rustc_resolve/src/ident.rs

@@ -1286,7 +1286,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
 &mutself,
 rib_index:usize,
 rib_ident:Ident,
-mutres:Res,
+res:Res,
 finalize:Option<Span>,
 original_rib_ident_def:Ident,
 all_ribs:&[Rib<'ra>],
@@ -1439,44 +1439,28 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
 }
 
 RibKind::ConstantItem(trivial, _) => {
-ifletConstantHasGenerics::No(cause) = trivial {
-// HACK(min_const_generics): If we encounter `Self` in an anonymous
-// constant we can't easily tell if it's generic at this stage, so
-// we instead remember this and then enforce the self type to be
-// concrete later on.
-ifletRes::SelfTyAlias{
-alias_to: def,
-forbid_generic: _,
- is_trait_impl,
-} = res
-{
- res = Res::SelfTyAlias{
-alias_to: def,
-forbid_generic:true,
- is_trait_impl,
-}
-}else{
-ifletSome(span) = finalize {
-let error = match cause {
-NoConstantGenericsReason::IsEnumDiscriminant => {
-ResolutionError::ParamInEnumDiscriminant{
-name: rib_ident.name,
-param_kind:ParamKindInEnumDiscriminant::Type,
-}
+ifletConstantHasGenerics::No(cause) = trivial
+ && !matches!(res,Res::SelfTyAlias{ .. })
+{
+ifletSome(span) = finalize {
+let error = match cause {
+NoConstantGenericsReason::IsEnumDiscriminant => {
+ResolutionError::ParamInEnumDiscriminant{
+name: rib_ident.name,
+param_kind:ParamKindInEnumDiscriminant::Type,
 }
-NoConstantGenericsReason::NonTrivialConstArg => {
-ResolutionError::ParamInNonTrivialAnonConst{
-name: rib_ident.name,
-param_kind:
-ParamKindInNonTrivialAnonConst::Type,
-}
+}
+NoConstantGenericsReason::NonTrivialConstArg => {
+ResolutionError::ParamInNonTrivialAnonConst{
+name: rib_ident.name,
+param_kind:ParamKindInNonTrivialAnonConst::Type,
 }
-};
-let _:ErrorGuaranteed = self.report_error(span, error);
-}
-
-returnRes::Err;
+}
+};
+let _:ErrorGuaranteed = self.report_error(span, error);
 }
+
+returnRes::Err;
 }
 
 continue;

compiler/rustc_resolve/src/late.rs

@@ -2655,11 +2655,7 @@ impl<'a, 'ast, 'ra, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
  |this| {
 let item_def_id = this.r.local_def_id(item.id).to_def_id();
  this.with_self_rib(
-Res::SelfTyAlias{
-alias_to: item_def_id,
-forbid_generic:false,
-is_trait_impl:false,
-},
+Res::SelfTyAlias{alias_to: item_def_id,is_trait_impl:false},
  |this| {
  visit::walk_item(this, item);
 },
@@ -3368,8 +3364,7 @@ impl<'a, 'ast, 'ra, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
 let item_def_id = item_def_id.to_def_id();
 let res = Res::SelfTyAlias{
 alias_to: item_def_id,
-forbid_generic:false,
-is_trait_impl: trait_id.is_some()
+is_trait_impl: trait_id.is_some(),
 };
  this.with_self_rib(res, |this| {
 ifletSome(of_trait) = of_trait {

compiler/rustc_span/src/symbol.rs

@@ -1788,6 +1788,8 @@ symbols! {
  ptr_slice_from_raw_parts_mut,
  ptr_swap,
  ptr_swap_nonoverlapping,
+ ptr_without_provenance,
+ ptr_without_provenance_mut,
  ptr_write,
  ptr_write_bytes,
  ptr_write_unaligned,

compiler/rustc_target/src/target_features.rs

@@ -588,7 +588,7 @@ const NVPTX_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
 staticRISCV_FEATURES:&[(&str,Stability,ImpliedFeatures)] = &[
 // tidy-alphabetical-start
 ("a",Stable,&["zaamo","zalrsc"]),
-("b",Unstable(sym::riscv_target_feature),&["zba","zbb","zbs"]),
+("b",Stable,&["zba","zbb","zbs"]),
 ("c",Stable,&["zca"]),
 ("d",Unstable(sym::riscv_target_feature),&["f"]),
 ("e",Unstable(sym::riscv_target_feature),&[]),
@@ -646,24 +646,24 @@ static RISCV_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
 ("unaligned-scalar-mem",Unstable(sym::riscv_target_feature),&[]),
 ("unaligned-vector-mem",Unstable(sym::riscv_target_feature),&[]),
 ("v",Unstable(sym::riscv_target_feature),&["zvl128b","zve64d"]),
-("za64rs",Unstable(sym::riscv_target_feature),&["za128rs"]),// Za64rs ⊃ Za128rs
-("za128rs",Unstable(sym::riscv_target_feature),&[]),
-("zaamo",Unstable(sym::riscv_target_feature),&[]),
-("zabha",Unstable(sym::riscv_target_feature),&["zaamo"]),
-("zacas",Unstable(sym::riscv_target_feature),&["zaamo"]),
-("zalrsc",Unstable(sym::riscv_target_feature),&[]),
-("zama16b",Unstable(sym::riscv_target_feature),&[]),
-("zawrs",Unstable(sym::riscv_target_feature),&[]),
+("za64rs",Stable,&["za128rs"]),// Za64rs ⊃ Za128rs
+("za128rs",Stable,&[]),
+("zaamo",Stable,&[]),
+("zabha",Stable,&["zaamo"]),
+("zacas",Stable,&["zaamo"]),
+("zalrsc",Stable,&[]),
+("zama16b",Stable,&[]),
+("zawrs",Stable,&[]),
 ("zba",Stable,&[]),
 ("zbb",Stable,&[]),
 ("zbc",Stable,&["zbkc"]),// Zbc ⊃ Zbkc
 ("zbkb",Stable,&[]),
 ("zbkc",Stable,&[]),
 ("zbkx",Stable,&[]),
 ("zbs",Stable,&[]),
-("zca",Unstable(sym::riscv_target_feature),&[]),
-("zcb",Unstable(sym::riscv_target_feature),&["zca"]),
-("zcmop",Unstable(sym::riscv_target_feature),&["zca"]),
+("zca",Stable,&[]),
+("zcb",Stable,&["zca"]),
+("zcmop",Stable,&["zca"]),
 ("zdinx",Unstable(sym::riscv_target_feature),&["zfinx"]),
 ("zfa",Unstable(sym::riscv_target_feature),&["f"]),
 ("zfbfmin",Unstable(sym::riscv_target_feature),&["f"]),// and a subset of Zfhmin
@@ -672,22 +672,22 @@ static RISCV_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
 ("zfinx",Unstable(sym::riscv_target_feature),&["zicsr"]),
 ("zhinx",Unstable(sym::riscv_target_feature),&["zhinxmin"]),
 ("zhinxmin",Unstable(sym::riscv_target_feature),&["zfinx"]),
-("zic64b",Unstable(sym::riscv_target_feature),&[]),
-("zicbom",Unstable(sym::riscv_target_feature),&[]),
-("zicbop",Unstable(sym::riscv_target_feature),&[]),
-("zicboz",Unstable(sym::riscv_target_feature),&[]),
-("ziccamoa",Unstable(sym::riscv_target_feature),&[]),
-("ziccif",Unstable(sym::riscv_target_feature),&[]),
-("zicclsm",Unstable(sym::riscv_target_feature),&[]),
-("ziccrse",Unstable(sym::riscv_target_feature),&[]),
-("zicntr",Unstable(sym::riscv_target_feature),&["zicsr"]),
-("zicond",Unstable(sym::riscv_target_feature),&[]),
-("zicsr",Unstable(sym::riscv_target_feature),&[]),
-("zifencei",Unstable(sym::riscv_target_feature),&[]),
-("zihintntl",Unstable(sym::riscv_target_feature),&[]),
-("zihintpause",Unstable(sym::riscv_target_feature),&[]),
-("zihpm",Unstable(sym::riscv_target_feature),&["zicsr"]),
-("zimop",Unstable(sym::riscv_target_feature),&[]),
+("zic64b",Stable,&[]),
+("zicbom",Stable,&[]),
+("zicbop",Stable,&[]),
+("zicboz",Stable,&[]),
+("ziccamoa",Stable,&[]),
+("ziccif",Stable,&[]),
+("zicclsm",Stable,&[]),
+("ziccrse",Stable,&[]),
+("zicntr",Stable,&["zicsr"]),
+("zicond",Stable,&[]),
+("zicsr",Stable,&[]),
+("zifencei",Stable,&[]),
+("zihintntl",Stable,&[]),
+("zihintpause",Stable,&[]),
+("zihpm",Stable,&["zicsr"]),
+("zimop",Stable,&[]),
 ("zk",Stable,&["zkn","zkr","zkt"]),
 ("zkn",Stable,&["zbkb","zbkc","zbkx","zkne","zknd","zknh"]),
 ("zknd",Stable,&["zkne_or_zknd"]),
@@ -699,7 +699,7 @@ static RISCV_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
 ("zksed",Stable,&[]),
 ("zksh",Stable,&[]),
 ("zkt",Stable,&[]),
-("ztso",Unstable(sym::riscv_target_feature),&[]),
+("ztso",Stable,&[]),
 ("zvbb",Unstable(sym::riscv_target_feature),&["zvkb"]),// Zvbb ⊃ Zvkb
 ("zvbc",Unstable(sym::riscv_target_feature),&["zve64x"]),
 ("zve32f",Unstable(sym::riscv_target_feature),&["zve32x","f"]),

compiler/rustc_trait_selection/src/error_reporting/traits/fulfillment_errors.rs

@@ -33,6 +33,7 @@ use rustc_middle::ty::{
 TypeVisitableExt,Upcast,
 };
 use rustc_middle::{bug, span_bug};
+use rustc_span::def_id::CrateNum;
 use rustc_span::{BytePos,DUMMY_SP,STDLIB_STABLE_CRATES,Span,Symbol, sym};
 use tracing::{debug, instrument};
 
@@ -1287,10 +1288,6 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
 self.tcx.def_span(def.did()),
 format!("`{self_ty}` needs to implement `From<{ty}>`"),
 );
- err.span_note(
-self.tcx.def_span(found.did()),
-format!("alternatively, `{ty}` needs to implement `Into<{self_ty}>`"),
-);
 }
 (ty::Adt(def, _),None)if def.did().is_local() => {
 let trait_path = self.tcx.short_string(
@@ -2172,6 +2169,13 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
 self.suggest_function_pointers_impl(None,&exp_found, err);
 }
 
+iflet ty::Adt(def, _) = trait_pred.self_ty().skip_binder().peel_refs().kind()
+ && let crates = self.tcx.duplicate_crate_names(def.did().krate)
+ && !crates.is_empty()
+{
+self.note_two_crate_versions(def.did().krate,MultiSpan::new(), err);
+ err.help("you can use `cargo tree` to explore your dependency tree");
+}
 true
 })
 }){
@@ -2282,6 +2286,14 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
 }
 ));
 }
+
+iflet ty::Adt(def, _) = trait_pred.self_ty().skip_binder().peel_refs().kind()
+ && let crates = self.tcx.duplicate_crate_names(def.did().krate)
+ && !crates.is_empty()
+{
+self.note_two_crate_versions(def.did().krate,MultiSpan::new(), err);
+ err.help("you can use `cargo tree` to explore your dependency tree");
+}
 true
 };
 
@@ -2445,11 +2457,11 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
 
 pubfnnote_two_crate_versions(
 &self,
-did:DefId,
+krate:CrateNum,
 sp:implInto<MultiSpan>,
 err:&mutDiag<'_>,
 ){
-let crate_name = self.tcx.crate_name(did.krate);
+let crate_name = self.tcx.crate_name(krate);
 let crate_msg = format!(
 "there are multiple different versions of crate `{crate_name}` in the dependency graph"
 );
@@ -2514,7 +2526,7 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
 
 for(similar_item, _)in similar_items {
  err.span_help(self.tcx.def_span(similar_item),"item with same name found");
-self.note_two_crate_versions(similar_item,MultiSpan::new(), err);
+self.note_two_crate_versions(similar_item.krate,MultiSpan::new(), err);
 }
 }
 

compiler/rustc_codegen_ssa/src/back/metadata.rs

@@ -330,14 +330,12 @@ pub(super) fn elf_e_flags(architecture: Architecture, sess: &Session) -> u32 {
 letmut e_flags:u32 = 0x0;
 
 // Check if compression is enabled
-// `unstable_target_features` is used here because "zca" is gated behind riscv_target_feature.
-if sess.unstable_target_features.contains(&sym::zca){
+if sess.target_features.contains(&sym::zca){
  e_flags |= elf::EF_RISCV_RVC;
 }
 
 // Check if RVTSO is enabled
-// `unstable_target_features` is used here because "ztso" is gated behind riscv_target_feature.
-if sess.unstable_target_features.contains(&sym::ztso){
+if sess.target_features.contains(&sym::ztso){
  e_flags |= elf::EF_RISCV_TSO;
 }
 

compiler/rustc_hir/src/def.rs

@@ -563,29 +563,6 @@ pub enum Res<Id = hir::HirId> {
 /// to get the underlying type.
 alias_to:DefId,
 
-/// Whether the `Self` type is disallowed from mentioning generics (i.e. when used in an
-/// anonymous constant).
-///
-/// HACK(min_const_generics): self types also have an optional requirement to **not**
-/// mention any generic parameters to allow the following with `min_const_generics`:
-/// ```
-/// # struct Foo;
-/// impl Foo { fn test() -> [u8; size_of::<Self>()] { todo!() } }
-///
-/// struct Bar([u8; baz::<Self>()]);
-/// const fn baz<T>() -> usize { 10 }
-/// ```
-/// We do however allow `Self` in repeat expression even if it is generic to not break code
-/// which already works on stable while causing the `const_evaluatable_unchecked` future
-/// compat lint:
-/// ```
-/// fn foo<T>() {
-/// let _bar = [1_u8; size_of::<*mut T>()];
-/// }
-/// ```
-// FIXME(generic_const_exprs): Remove this bodge once that feature is stable.
-forbid_generic:bool,
-
 /// Is this within an `impl Foo for bar`?
 is_trait_impl:bool,
 },
@@ -910,8 +887,8 @@ impl<Id> Res<Id> {
 Res::PrimTy(id) => Res::PrimTy(id),
 Res::Local(id) => Res::Local(map(id)),
 Res::SelfTyParam{ trait_ } => Res::SelfTyParam{ trait_ },
-Res::SelfTyAlias{ alias_to,forbid_generic,is_trait_impl } => {
-Res::SelfTyAlias{ alias_to,forbid_generic,is_trait_impl }
+Res::SelfTyAlias{ alias_to, is_trait_impl } => {
+Res::SelfTyAlias{ alias_to, is_trait_impl }
 }
 Res::ToolMod => Res::ToolMod,
 Res::NonMacroAttr(attr_kind) => Res::NonMacroAttr(attr_kind),
@@ -926,8 +903,8 @@ impl<Id> Res<Id> {
 Res::PrimTy(id) => Res::PrimTy(id),
 Res::Local(id) => Res::Local(map(id)?),
 Res::SelfTyParam{ trait_ } => Res::SelfTyParam{ trait_ },
-Res::SelfTyAlias{ alias_to,forbid_generic,is_trait_impl } => {
-Res::SelfTyAlias{ alias_to,forbid_generic,is_trait_impl }
+Res::SelfTyAlias{ alias_to, is_trait_impl } => {
+Res::SelfTyAlias{ alias_to, is_trait_impl }
 }
 Res::ToolMod => Res::ToolMod,
 Res::NonMacroAttr(attr_kind) => Res::NonMacroAttr(attr_kind),

compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs

@@ -2149,7 +2149,7 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
 );
 self.check_param_uses_if_mcg(tcx.types.self_param, span,false)
 }
-Res::SelfTyAlias{alias_to: def_id,forbid_generic: _,.. } => {
+Res::SelfTyAlias{alias_to: def_id, .. } => {
 // `Self` in impl (we know the concrete type).
 assert_eq!(opt_self_ty,None);
 // Try to evaluate any array length constants.

compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs

@@ -559,6 +559,15 @@ pub(in crate::rmeta) fn provide(providers: &mut Providers) {
 .filter_map(|(cnum, data)| data.used().then_some(cnum)),
 )
 },
+duplicate_crate_names: |tcx,c:CrateNum| {
+let name = tcx.crate_name(c);
+ tcx.arena.alloc_from_iter(
+ tcx.crates(())
+.into_iter()
+.filter(|k| tcx.crate_name(**k) == name && **k != c)
+.map(|c| *c),
+)
+},
  ..providers.queries
 };
 provide_extern(&mut providers.extern_queries);

compiler/rustc_middle/src/query/mod.rs

@@ -2334,6 +2334,7 @@ rustc_queries! {
  eval_always
  desc {"fetching all foreign CrateNum instances"}
 }
+
 // Crates that are loaded non-speculatively (not for diagnostics or doc links).
 // FIXME: This is currently only used for collecting lang items, but should be used instead of
 // `crates` in most other cases too.
@@ -2342,6 +2343,14 @@ rustc_queries! {
  desc {"fetching `CrateNum`s for all crates loaded non-speculatively"}
 }
 
+/// All crates that share the same name as crate `c`.
+///
+/// This normally occurs when multiple versions of the same dependency are present in the
+/// dependency tree.
+ query duplicate_crate_names(c:CrateNum) -> &'tcx [CrateNum]{
+ desc {"fetching `CrateNum`s with same name as `{c:?}`"}
+}
+
 /// A list of all traits in a crate, used by rustdoc and error reporting.
  query traits(_:CrateNum) -> &'tcx [DefId]{
  desc {"fetching all traits in a crate"}

compiler/rustc_resolve/src/ident.rs

@@ -1286,7 +1286,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
 &mutself,
 rib_index:usize,
 rib_ident:Ident,
-mutres:Res,
+res:Res,
 finalize:Option<Span>,
 original_rib_ident_def:Ident,
 all_ribs:&[Rib<'ra>],
@@ -1439,44 +1439,28 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
 }
 
 RibKind::ConstantItem(trivial, _) => {
-ifletConstantHasGenerics::No(cause) = trivial {
-// HACK(min_const_generics): If we encounter `Self` in an anonymous
-// constant we can't easily tell if it's generic at this stage, so
-// we instead remember this and then enforce the self type to be
-// concrete later on.
-ifletRes::SelfTyAlias{
-alias_to: def,
-forbid_generic: _,
- is_trait_impl,
-} = res
-{
- res = Res::SelfTyAlias{
-alias_to: def,
-forbid_generic:true,
- is_trait_impl,
-}
-}else{
-ifletSome(span) = finalize {
-let error = match cause {
-NoConstantGenericsReason::IsEnumDiscriminant => {
-ResolutionError::ParamInEnumDiscriminant{
-name: rib_ident.name,
-param_kind:ParamKindInEnumDiscriminant::Type,
-}
+ifletConstantHasGenerics::No(cause) = trivial
+ && !matches!(res,Res::SelfTyAlias{ .. })
+{
+ifletSome(span) = finalize {
+let error = match cause {
+NoConstantGenericsReason::IsEnumDiscriminant => {
+ResolutionError::ParamInEnumDiscriminant{
+name: rib_ident.name,
+param_kind:ParamKindInEnumDiscriminant::Type,
 }
-NoConstantGenericsReason::NonTrivialConstArg => {
-ResolutionError::ParamInNonTrivialAnonConst{
-name: rib_ident.name,
-param_kind:
-ParamKindInNonTrivialAnonConst::Type,
-}
+}
+NoConstantGenericsReason::NonTrivialConstArg => {
+ResolutionError::ParamInNonTrivialAnonConst{
+name: rib_ident.name,
+param_kind:ParamKindInNonTrivialAnonConst::Type,
 }
-};
-let _:ErrorGuaranteed = self.report_error(span, error);
-}
-
-returnRes::Err;
+}
+};
+let _:ErrorGuaranteed = self.report_error(span, error);
 }
+
+returnRes::Err;
 }
 
 continue;

compiler/rustc_resolve/src/late.rs

@@ -2655,11 +2655,7 @@ impl<'a, 'ast, 'ra, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
  |this| {
 let item_def_id = this.r.local_def_id(item.id).to_def_id();
  this.with_self_rib(
-Res::SelfTyAlias{
-alias_to: item_def_id,
-forbid_generic:false,
-is_trait_impl:false,
-},
+Res::SelfTyAlias{alias_to: item_def_id,is_trait_impl:false},
  |this| {
  visit::walk_item(this, item);
 },
@@ -3368,8 +3364,7 @@ impl<'a, 'ast, 'ra, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
 let item_def_id = item_def_id.to_def_id();
 let res = Res::SelfTyAlias{
 alias_to: item_def_id,
-forbid_generic:false,
-is_trait_impl: trait_id.is_some()
+is_trait_impl: trait_id.is_some(),
 };
  this.with_self_rib(res, |this| {
 ifletSome(of_trait) = of_trait {

compiler/rustc_span/src/symbol.rs

@@ -1788,6 +1788,8 @@ symbols! {
  ptr_slice_from_raw_parts_mut,
  ptr_swap,
  ptr_swap_nonoverlapping,
+ ptr_without_provenance,
+ ptr_without_provenance_mut,
  ptr_write,
  ptr_write_bytes,
  ptr_write_unaligned,

compiler/rustc_target/src/target_features.rs

@@ -588,7 +588,7 @@ const NVPTX_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
 staticRISCV_FEATURES:&[(&str,Stability,ImpliedFeatures)] = &[
 // tidy-alphabetical-start
 ("a",Stable,&["zaamo","zalrsc"]),
-("b",Unstable(sym::riscv_target_feature),&["zba","zbb","zbs"]),
+("b",Stable,&["zba","zbb","zbs"]),
 ("c",Stable,&["zca"]),
 ("d",Unstable(sym::riscv_target_feature),&["f"]),
 ("e",Unstable(sym::riscv_target_feature),&[]),
@@ -646,24 +646,24 @@ static RISCV_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
 ("unaligned-scalar-mem",Unstable(sym::riscv_target_feature),&[]),
 ("unaligned-vector-mem",Unstable(sym::riscv_target_feature),&[]),
 ("v",Unstable(sym::riscv_target_feature),&["zvl128b","zve64d"]),
-("za64rs",Unstable(sym::riscv_target_feature),&["za128rs"]),// Za64rs ⊃ Za128rs
-("za128rs",Unstable(sym::riscv_target_feature),&[]),
-("zaamo",Unstable(sym::riscv_target_feature),&[]),
-("zabha",Unstable(sym::riscv_target_feature),&["zaamo"]),
-("zacas",Unstable(sym::riscv_target_feature),&["zaamo"]),
-("zalrsc",Unstable(sym::riscv_target_feature),&[]),
-("zama16b",Unstable(sym::riscv_target_feature),&[]),
-("zawrs",Unstable(sym::riscv_target_feature),&[]),
+("za64rs",Stable,&["za128rs"]),// Za64rs ⊃ Za128rs
+("za128rs",Stable,&[]),
+("zaamo",Stable,&[]),
+("zabha",Stable,&["zaamo"]),
+("zacas",Stable,&["zaamo"]),
+("zalrsc",Stable,&[]),
+("zama16b",Stable,&[]),
+("zawrs",Stable,&[]),
 ("zba",Stable,&[]),
 ("zbb",Stable,&[]),
 ("zbc",Stable,&["zbkc"]),// Zbc ⊃ Zbkc
 ("zbkb",Stable,&[]),
 ("zbkc",Stable,&[]),
 ("zbkx",Stable,&[]),
 ("zbs",Stable,&[]),
-("zca",Unstable(sym::riscv_target_feature),&[]),
-("zcb",Unstable(sym::riscv_target_feature),&["zca"]),
-("zcmop",Unstable(sym::riscv_target_feature),&["zca"]),
+("zca",Stable,&[]),
+("zcb",Stable,&["zca"]),
+("zcmop",Stable,&["zca"]),
 ("zdinx",Unstable(sym::riscv_target_feature),&["zfinx"]),
 ("zfa",Unstable(sym::riscv_target_feature),&["f"]),
 ("zfbfmin",Unstable(sym::riscv_target_feature),&["f"]),// and a subset of Zfhmin
@@ -672,22 +672,22 @@ static RISCV_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
 ("zfinx",Unstable(sym::riscv_target_feature),&["zicsr"]),
 ("zhinx",Unstable(sym::riscv_target_feature),&["zhinxmin"]),
 ("zhinxmin",Unstable(sym::riscv_target_feature),&["zfinx"]),
-("zic64b",Unstable(sym::riscv_target_feature),&[]),
-("zicbom",Unstable(sym::riscv_target_feature),&[]),
-("zicbop",Unstable(sym::riscv_target_feature),&[]),
-("zicboz",Unstable(sym::riscv_target_feature),&[]),
-("ziccamoa",Unstable(sym::riscv_target_feature),&[]),
-("ziccif",Unstable(sym::riscv_target_feature),&[]),
-("zicclsm",Unstable(sym::riscv_target_feature),&[]),
-("ziccrse",Unstable(sym::riscv_target_feature),&[]),
-("zicntr",Unstable(sym::riscv_target_feature),&["zicsr"]),
-("zicond",Unstable(sym::riscv_target_feature),&[]),
-("zicsr",Unstable(sym::riscv_target_feature),&[]),
-("zifencei",Unstable(sym::riscv_target_feature),&[]),
-("zihintntl",Unstable(sym::riscv_target_feature),&[]),
-("zihintpause",Unstable(sym::riscv_target_feature),&[]),
-("zihpm",Unstable(sym::riscv_target_feature),&["zicsr"]),
-("zimop",Unstable(sym::riscv_target_feature),&[]),
+("zic64b",Stable,&[]),
+("zicbom",Stable,&[]),
+("zicbop",Stable,&[]),
+("zicboz",Stable,&[]),
+("ziccamoa",Stable,&[]),
+("ziccif",Stable,&[]),
+("zicclsm",Stable,&[]),
+("ziccrse",Stable,&[]),
+("zicntr",Stable,&["zicsr"]),
+("zicond",Stable,&[]),
+("zicsr",Stable,&[]),
+("zifencei",Stable,&[]),
+("zihintntl",Stable,&[]),
+("zihintpause",Stable,&[]),
+("zihpm",Stable,&["zicsr"]),
+("zimop",Stable,&[]),
 ("zk",Stable,&["zkn","zkr","zkt"]),
 ("zkn",Stable,&["zbkb","zbkc","zbkx","zkne","zknd","zknh"]),
 ("zknd",Stable,&["zkne_or_zknd"]),
@@ -699,7 +699,7 @@ static RISCV_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
 ("zksed",Stable,&[]),
 ("zksh",Stable,&[]),
 ("zkt",Stable,&[]),
-("ztso",Unstable(sym::riscv_target_feature),&[]),
+("ztso",Stable,&[]),
 ("zvbb",Unstable(sym::riscv_target_feature),&["zvkb"]),// Zvbb ⊃ Zvkb
 ("zvbc",Unstable(sym::riscv_target_feature),&["zve64x"]),
 ("zve32f",Unstable(sym::riscv_target_feature),&["zve32x","f"]),

compiler/rustc_trait_selection/src/error_reporting/traits/fulfillment_errors.rs

@@ -33,6 +33,7 @@ use rustc_middle::ty::{
 TypeVisitableExt,Upcast,
 };
 use rustc_middle::{bug, span_bug};
+use rustc_span::def_id::CrateNum;
 use rustc_span::{BytePos,DUMMY_SP,STDLIB_STABLE_CRATES,Span,Symbol, sym};
 use tracing::{debug, instrument};
 
@@ -1287,10 +1288,6 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
 self.tcx.def_span(def.did()),
 format!("`{self_ty}` needs to implement `From<{ty}>`"),
 );
- err.span_note(
-self.tcx.def_span(found.did()),
-format!("alternatively, `{ty}` needs to implement `Into<{self_ty}>`"),
-);
 }
 (ty::Adt(def, _),None)if def.did().is_local() => {
 let trait_path = self.tcx.short_string(
@@ -2172,6 +2169,13 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
 self.suggest_function_pointers_impl(None,&exp_found, err);
 }
 
+iflet ty::Adt(def, _) = trait_pred.self_ty().skip_binder().peel_refs().kind()
+ && let crates = self.tcx.duplicate_crate_names(def.did().krate)
+ && !crates.is_empty()
+{
+self.note_two_crate_versions(def.did().krate,MultiSpan::new(), err);
+ err.help("you can use `cargo tree` to explore your dependency tree");
+}
 true
 })
 }){
@@ -2282,6 +2286,14 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
 }
 ));
 }
+
+iflet ty::Adt(def, _) = trait_pred.self_ty().skip_binder().peel_refs().kind()
+ && let crates = self.tcx.duplicate_crate_names(def.did().krate)
+ && !crates.is_empty()
+{
+self.note_two_crate_versions(def.did().krate,MultiSpan::new(), err);
+ err.help("you can use `cargo tree` to explore your dependency tree");
+}
 true
 };
 
@@ -2445,11 +2457,11 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
 
 pubfnnote_two_crate_versions(
 &self,
-did:DefId,
+krate:CrateNum,
 sp:implInto<MultiSpan>,
 err:&mutDiag<'_>,
 ){
-let crate_name = self.tcx.crate_name(did.krate);
+let crate_name = self.tcx.crate_name(krate);
 let crate_msg = format!(
 "there are multiple different versions of crate `{crate_name}` in the dependency graph"
 );
@@ -2514,7 +2526,7 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
 
 for(similar_item, _)in similar_items {
  err.span_help(self.tcx.def_span(similar_item),"item with same name found");
-self.note_two_crate_versions(similar_item,MultiSpan::new(), err);
+self.note_two_crate_versions(similar_item.krate,MultiSpan::new(), err);
 }
 }
 

compiler/rustc_codegen_ssa/src/back/metadata.rs

@@ -330,14 +330,12 @@ pub(super) fn elf_e_flags(architecture: Architecture, sess: &Session) -> u32 {
 letmut e_flags:u32 = 0x0;
 
 // Check if compression is enabled
-// `unstable_target_features` is used here because "zca" is gated behind riscv_target_feature.
-if sess.unstable_target_features.contains(&sym::zca){
+if sess.target_features.contains(&sym::zca){
  e_flags |= elf::EF_RISCV_RVC;
 }
 
 // Check if RVTSO is enabled
-// `unstable_target_features` is used here because "ztso" is gated behind riscv_target_feature.
-if sess.unstable_target_features.contains(&sym::ztso){
+if sess.target_features.contains(&sym::ztso){
  e_flags |= elf::EF_RISCV_TSO;
 }
 

compiler/rustc_hir/src/def.rs

@@ -563,29 +563,6 @@ pub enum Res<Id = hir::HirId> {
 /// to get the underlying type.
 alias_to:DefId,
 
-/// Whether the `Self` type is disallowed from mentioning generics (i.e. when used in an
-/// anonymous constant).
-///
-/// HACK(min_const_generics): self types also have an optional requirement to **not**
-/// mention any generic parameters to allow the following with `min_const_generics`:
-/// ```
-/// # struct Foo;
-/// impl Foo { fn test() -> [u8; size_of::<Self>()] { todo!() } }
-///
-/// struct Bar([u8; baz::<Self>()]);
-/// const fn baz<T>() -> usize { 10 }
-/// ```
-/// We do however allow `Self` in repeat expression even if it is generic to not break code
-/// which already works on stable while causing the `const_evaluatable_unchecked` future
-/// compat lint:
-/// ```
-/// fn foo<T>() {
-/// let _bar = [1_u8; size_of::<*mut T>()];
-/// }
-/// ```
-// FIXME(generic_const_exprs): Remove this bodge once that feature is stable.
-forbid_generic:bool,
-
 /// Is this within an `impl Foo for bar`?
 is_trait_impl:bool,
 },
@@ -910,8 +887,8 @@ impl<Id> Res<Id> {
 Res::PrimTy(id) => Res::PrimTy(id),
 Res::Local(id) => Res::Local(map(id)),
 Res::SelfTyParam{ trait_ } => Res::SelfTyParam{ trait_ },
-Res::SelfTyAlias{ alias_to,forbid_generic,is_trait_impl } => {
-Res::SelfTyAlias{ alias_to,forbid_generic,is_trait_impl }
+Res::SelfTyAlias{ alias_to, is_trait_impl } => {
+Res::SelfTyAlias{ alias_to, is_trait_impl }
 }
 Res::ToolMod => Res::ToolMod,
 Res::NonMacroAttr(attr_kind) => Res::NonMacroAttr(attr_kind),
@@ -926,8 +903,8 @@ impl<Id> Res<Id> {
 Res::PrimTy(id) => Res::PrimTy(id),
 Res::Local(id) => Res::Local(map(id)?),
 Res::SelfTyParam{ trait_ } => Res::SelfTyParam{ trait_ },
-Res::SelfTyAlias{ alias_to,forbid_generic,is_trait_impl } => {
-Res::SelfTyAlias{ alias_to,forbid_generic,is_trait_impl }
+Res::SelfTyAlias{ alias_to, is_trait_impl } => {
+Res::SelfTyAlias{ alias_to, is_trait_impl }
 }
 Res::ToolMod => Res::ToolMod,
 Res::NonMacroAttr(attr_kind) => Res::NonMacroAttr(attr_kind),

compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs

@@ -2149,7 +2149,7 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
 );
 self.check_param_uses_if_mcg(tcx.types.self_param, span,false)
 }
-Res::SelfTyAlias{alias_to: def_id,forbid_generic: _,.. } => {
+Res::SelfTyAlias{alias_to: def_id, .. } => {
 // `Self` in impl (we know the concrete type).
 assert_eq!(opt_self_ty,None);
 // Try to evaluate any array length constants.

compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs

@@ -559,6 +559,15 @@ pub(in crate::rmeta) fn provide(providers: &mut Providers) {
 .filter_map(|(cnum, data)| data.used().then_some(cnum)),
 )
 },
+duplicate_crate_names: |tcx,c:CrateNum| {
+let name = tcx.crate_name(c);
+ tcx.arena.alloc_from_iter(
+ tcx.crates(())
+.into_iter()
+.filter(|k| tcx.crate_name(**k) == name && **k != c)
+.map(|c| *c),
+)
+},
  ..providers.queries
 };
 provide_extern(&mut providers.extern_queries);

compiler/rustc_middle/src/query/mod.rs

@@ -2334,6 +2334,7 @@ rustc_queries! {
  eval_always
  desc {"fetching all foreign CrateNum instances"}
 }
+
 // Crates that are loaded non-speculatively (not for diagnostics or doc links).
 // FIXME: This is currently only used for collecting lang items, but should be used instead of
 // `crates` in most other cases too.
@@ -2342,6 +2343,14 @@ rustc_queries! {
  desc {"fetching `CrateNum`s for all crates loaded non-speculatively"}
 }
 
+/// All crates that share the same name as crate `c`.
+///
+/// This normally occurs when multiple versions of the same dependency are present in the
+/// dependency tree.
+ query duplicate_crate_names(c:CrateNum) -> &'tcx [CrateNum]{
+ desc {"fetching `CrateNum`s with same name as `{c:?}`"}
+}
+
 /// A list of all traits in a crate, used by rustdoc and error reporting.
  query traits(_:CrateNum) -> &'tcx [DefId]{
  desc {"fetching all traits in a crate"}

compiler/rustc_resolve/src/ident.rs

@@ -1286,7 +1286,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
 &mutself,
 rib_index:usize,
 rib_ident:Ident,
-mutres:Res,
+res:Res,
 finalize:Option<Span>,
 original_rib_ident_def:Ident,
 all_ribs:&[Rib<'ra>],
@@ -1439,44 +1439,28 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
 }
 
 RibKind::ConstantItem(trivial, _) => {
-ifletConstantHasGenerics::No(cause) = trivial {
-// HACK(min_const_generics): If we encounter `Self` in an anonymous
-// constant we can't easily tell if it's generic at this stage, so
-// we instead remember this and then enforce the self type to be
-// concrete later on.
-ifletRes::SelfTyAlias{
-alias_to: def,
-forbid_generic: _,
- is_trait_impl,
-} = res
-{
- res = Res::SelfTyAlias{
-alias_to: def,
-forbid_generic:true,
- is_trait_impl,
-}
-}else{
-ifletSome(span) = finalize {
-let error = match cause {
-NoConstantGenericsReason::IsEnumDiscriminant => {
-ResolutionError::ParamInEnumDiscriminant{
-name: rib_ident.name,
-param_kind:ParamKindInEnumDiscriminant::Type,
-}
+ifletConstantHasGenerics::No(cause) = trivial
+ && !matches!(res,Res::SelfTyAlias{ .. })
+{
+ifletSome(span) = finalize {
+let error = match cause {
+NoConstantGenericsReason::IsEnumDiscriminant => {
+ResolutionError::ParamInEnumDiscriminant{
+name: rib_ident.name,
+param_kind:ParamKindInEnumDiscriminant::Type,
 }
-NoConstantGenericsReason::NonTrivialConstArg => {
-ResolutionError::ParamInNonTrivialAnonConst{
-name: rib_ident.name,
-param_kind:
-ParamKindInNonTrivialAnonConst::Type,
-}
+}
+NoConstantGenericsReason::NonTrivialConstArg => {
+ResolutionError::ParamInNonTrivialAnonConst{
+name: rib_ident.name,
+param_kind:ParamKindInNonTrivialAnonConst::Type,
 }
-};
-let _:ErrorGuaranteed = self.report_error(span, error);
-}
-
-returnRes::Err;
+}
+};
+let _:ErrorGuaranteed = self.report_error(span, error);
 }
+
+returnRes::Err;
 }
 
 continue;

compiler/rustc_resolve/src/late.rs

@@ -2655,11 +2655,7 @@ impl<'a, 'ast, 'ra, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
  |this| {
 let item_def_id = this.r.local_def_id(item.id).to_def_id();
  this.with_self_rib(
-Res::SelfTyAlias{
-alias_to: item_def_id,
-forbid_generic:false,
-is_trait_impl:false,
-},
+Res::SelfTyAlias{alias_to: item_def_id,is_trait_impl:false},
  |this| {
  visit::walk_item(this, item);
 },
@@ -3368,8 +3364,7 @@ impl<'a, 'ast, 'ra, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
 let item_def_id = item_def_id.to_def_id();
 let res = Res::SelfTyAlias{
 alias_to: item_def_id,
-forbid_generic:false,
-is_trait_impl: trait_id.is_some()
+is_trait_impl: trait_id.is_some(),
 };
  this.with_self_rib(res, |this| {
 ifletSome(of_trait) = of_trait {

compiler/rustc_span/src/symbol.rs

@@ -1788,6 +1788,8 @@ symbols! {
  ptr_slice_from_raw_parts_mut,
  ptr_swap,
  ptr_swap_nonoverlapping,
+ ptr_without_provenance,
+ ptr_without_provenance_mut,
  ptr_write,
  ptr_write_bytes,
  ptr_write_unaligned,

compiler/rustc_target/src/target_features.rs

@@ -588,7 +588,7 @@ const NVPTX_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
 staticRISCV_FEATURES:&[(&str,Stability,ImpliedFeatures)] = &[
 // tidy-alphabetical-start
 ("a",Stable,&["zaamo","zalrsc"]),
-("b",Unstable(sym::riscv_target_feature),&["zba","zbb","zbs"]),
+("b",Stable,&["zba","zbb","zbs"]),
 ("c",Stable,&["zca"]),
 ("d",Unstable(sym::riscv_target_feature),&["f"]),
 ("e",Unstable(sym::riscv_target_feature),&[]),
@@ -646,24 +646,24 @@ static RISCV_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
 ("unaligned-scalar-mem",Unstable(sym::riscv_target_feature),&[]),
 ("unaligned-vector-mem",Unstable(sym::riscv_target_feature),&[]),
 ("v",Unstable(sym::riscv_target_feature),&["zvl128b","zve64d"]),
-("za64rs",Unstable(sym::riscv_target_feature),&["za128rs"]),// Za64rs ⊃ Za128rs
-("za128rs",Unstable(sym::riscv_target_feature),&[]),
-("zaamo",Unstable(sym::riscv_target_feature),&[]),
-("zabha",Unstable(sym::riscv_target_feature),&["zaamo"]),
-("zacas",Unstable(sym::riscv_target_feature),&["zaamo"]),
-("zalrsc",Unstable(sym::riscv_target_feature),&[]),
-("zama16b",Unstable(sym::riscv_target_feature),&[]),
-("zawrs",Unstable(sym::riscv_target_feature),&[]),
+("za64rs",Stable,&["za128rs"]),// Za64rs ⊃ Za128rs
+("za128rs",Stable,&[]),
+("zaamo",Stable,&[]),
+("zabha",Stable,&["zaamo"]),
+("zacas",Stable,&["zaamo"]),
+("zalrsc",Stable,&[]),
+("zama16b",Stable,&[]),
+("zawrs",Stable,&[]),
 ("zba",Stable,&[]),
 ("zbb",Stable,&[]),
 ("zbc",Stable,&["zbkc"]),// Zbc ⊃ Zbkc
 ("zbkb",Stable,&[]),
 ("zbkc",Stable,&[]),
 ("zbkx",Stable,&[]),
 ("zbs",Stable,&[]),
-("zca",Unstable(sym::riscv_target_feature),&[]),
-("zcb",Unstable(sym::riscv_target_feature),&["zca"]),
-("zcmop",Unstable(sym::riscv_target_feature),&["zca"]),
+("zca",Stable,&[]),
+("zcb",Stable,&["zca"]),
+("zcmop",Stable,&["zca"]),
 ("zdinx",Unstable(sym::riscv_target_feature),&["zfinx"]),
 ("zfa",Unstable(sym::riscv_target_feature),&["f"]),
 ("zfbfmin",Unstable(sym::riscv_target_feature),&["f"]),// and a subset of Zfhmin
@@ -672,22 +672,22 @@ static RISCV_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
 ("zfinx",Unstable(sym::riscv_target_feature),&["zicsr"]),
 ("zhinx",Unstable(sym::riscv_target_feature),&["zhinxmin"]),
 ("zhinxmin",Unstable(sym::riscv_target_feature),&["zfinx"]),
-("zic64b",Unstable(sym::riscv_target_feature),&[]),
-("zicbom",Unstable(sym::riscv_target_feature),&[]),
-("zicbop",Unstable(sym::riscv_target_feature),&[]),
-("zicboz",Unstable(sym::riscv_target_feature),&[]),
-("ziccamoa",Unstable(sym::riscv_target_feature),&[]),
-("ziccif",Unstable(sym::riscv_target_feature),&[]),
-("zicclsm",Unstable(sym::riscv_target_feature),&[]),
-("ziccrse",Unstable(sym::riscv_target_feature),&[]),
-("zicntr",Unstable(sym::riscv_target_feature),&["zicsr"]),
-("zicond",Unstable(sym::riscv_target_feature),&[]),
-("zicsr",Unstable(sym::riscv_target_feature),&[]),
-("zifencei",Unstable(sym::riscv_target_feature),&[]),
-("zihintntl",Unstable(sym::riscv_target_feature),&[]),
-("zihintpause",Unstable(sym::riscv_target_feature),&[]),
-("zihpm",Unstable(sym::riscv_target_feature),&["zicsr"]),
-("zimop",Unstable(sym::riscv_target_feature),&[]),
+("zic64b",Stable,&[]),
+("zicbom",Stable,&[]),
+("zicbop",Stable,&[]),
+("zicboz",Stable,&[]),
+("ziccamoa",Stable,&[]),
+("ziccif",Stable,&[]),
+("zicclsm",Stable,&[]),
+("ziccrse",Stable,&[]),
+("zicntr",Stable,&["zicsr"]),
+("zicond",Stable,&[]),
+("zicsr",Stable,&[]),
+("zifencei",Stable,&[]),
+("zihintntl",Stable,&[]),
+("zihintpause",Stable,&[]),
+("zihpm",Stable,&["zicsr"]),
+("zimop",Stable,&[]),
 ("zk",Stable,&["zkn","zkr","zkt"]),
 ("zkn",Stable,&["zbkb","zbkc","zbkx","zkne","zknd","zknh"]),
 ("zknd",Stable,&["zkne_or_zknd"]),
@@ -699,7 +699,7 @@ static RISCV_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
 ("zksed",Stable,&[]),
 ("zksh",Stable,&[]),
 ("zkt",Stable,&[]),
-("ztso",Unstable(sym::riscv_target_feature),&[]),
+("ztso",Stable,&[]),
 ("zvbb",Unstable(sym::riscv_target_feature),&["zvkb"]),// Zvbb ⊃ Zvkb
 ("zvbc",Unstable(sym::riscv_target_feature),&["zve64x"]),
 ("zve32f",Unstable(sym::riscv_target_feature),&["zve32x","f"]),

compiler/rustc_trait_selection/src/error_reporting/traits/fulfillment_errors.rs

@@ -33,6 +33,7 @@ use rustc_middle::ty::{
 TypeVisitableExt,Upcast,
 };
 use rustc_middle::{bug, span_bug};
+use rustc_span::def_id::CrateNum;
 use rustc_span::{BytePos,DUMMY_SP,STDLIB_STABLE_CRATES,Span,Symbol, sym};
 use tracing::{debug, instrument};
 
@@ -1287,10 +1288,6 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
 self.tcx.def_span(def.did()),
 format!("`{self_ty}` needs to implement `From<{ty}>`"),
 );
- err.span_note(
-self.tcx.def_span(found.did()),
-format!("alternatively, `{ty}` needs to implement `Into<{self_ty}>`"),
-);
 }
 (ty::Adt(def, _),None)if def.did().is_local() => {
 let trait_path = self.tcx.short_string(
@@ -2172,6 +2169,13 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
 self.suggest_function_pointers_impl(None,&exp_found, err);
 }
 
+iflet ty::Adt(def, _) = trait_pred.self_ty().skip_binder().peel_refs().kind()
+ && let crates = self.tcx.duplicate_crate_names(def.did().krate)
+ && !crates.is_empty()
+{
+self.note_two_crate_versions(def.did().krate,MultiSpan::new(), err);
+ err.help("you can use `cargo tree` to explore your dependency tree");
+}
 true
 })
 }){
@@ -2282,6 +2286,14 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
 }
 ));
 }
+
+iflet ty::Adt(def, _) = trait_pred.self_ty().skip_binder().peel_refs().kind()
+ && let crates = self.tcx.duplicate_crate_names(def.did().krate)
+ && !crates.is_empty()
+{
+self.note_two_crate_versions(def.did().krate,MultiSpan::new(), err);
+ err.help("you can use `cargo tree` to explore your dependency tree");
+}
 true
 };
 
@@ -2445,11 +2457,11 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
 
 pubfnnote_two_crate_versions(
 &self,
-did:DefId,
+krate:CrateNum,
 sp:implInto<MultiSpan>,
 err:&mutDiag<'_>,
 ){
-let crate_name = self.tcx.crate_name(did.krate);
+let crate_name = self.tcx.crate_name(krate);
 let crate_msg = format!(
 "there are multiple different versions of crate `{crate_name}` in the dependency graph"
 );
@@ -2514,7 +2526,7 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
 
 for(similar_item, _)in similar_items {
  err.span_help(self.tcx.def_span(similar_item),"item with same name found");
-self.note_two_crate_versions(similar_item,MultiSpan::new(), err);
+self.note_two_crate_versions(similar_item.krate,MultiSpan::new(), err);
 }
 }
 

compiler/rustc_codegen_ssa/src/back/metadata.rs

@@ -330,14 +330,12 @@ pub(super) fn elf_e_flags(architecture: Architecture, sess: &Session) -> u32 {
 letmut e_flags:u32 = 0x0;
 
 // Check if compression is enabled
-// `unstable_target_features` is used here because "zca" is gated behind riscv_target_feature.
-if sess.unstable_target_features.contains(&sym::zca){
+if sess.target_features.contains(&sym::zca){
  e_flags |= elf::EF_RISCV_RVC;
 }
 
 // Check if RVTSO is enabled
-// `unstable_target_features` is used here because "ztso" is gated behind riscv_target_feature.
-if sess.unstable_target_features.contains(&sym::ztso){
+if sess.target_features.contains(&sym::ztso){
  e_flags |= elf::EF_RISCV_TSO;
 }
 

compiler/rustc_hir/src/def.rs

@@ -563,29 +563,6 @@ pub enum Res<Id = hir::HirId> {
 /// to get the underlying type.
 alias_to:DefId,
 
-/// Whether the `Self` type is disallowed from mentioning generics (i.e. when used in an
-/// anonymous constant).
-///
-/// HACK(min_const_generics): self types also have an optional requirement to **not**
-/// mention any generic parameters to allow the following with `min_const_generics`:
-/// ```
-/// # struct Foo;
-/// impl Foo { fn test() -> [u8; size_of::<Self>()] { todo!() } }
-///
-/// struct Bar([u8; baz::<Self>()]);
-/// const fn baz<T>() -> usize { 10 }
-/// ```
-/// We do however allow `Self` in repeat expression even if it is generic to not break code
-/// which already works on stable while causing the `const_evaluatable_unchecked` future
-/// compat lint:
-/// ```
-/// fn foo<T>() {
-/// let _bar = [1_u8; size_of::<*mut T>()];
-/// }
-/// ```
-// FIXME(generic_const_exprs): Remove this bodge once that feature is stable.
-forbid_generic:bool,
-
 /// Is this within an `impl Foo for bar`?
 is_trait_impl:bool,
 },
@@ -910,8 +887,8 @@ impl<Id> Res<Id> {
 Res::PrimTy(id) => Res::PrimTy(id),
 Res::Local(id) => Res::Local(map(id)),
 Res::SelfTyParam{ trait_ } => Res::SelfTyParam{ trait_ },
-Res::SelfTyAlias{ alias_to,forbid_generic,is_trait_impl } => {
-Res::SelfTyAlias{ alias_to,forbid_generic,is_trait_impl }
+Res::SelfTyAlias{ alias_to, is_trait_impl } => {
+Res::SelfTyAlias{ alias_to, is_trait_impl }
 }
 Res::ToolMod => Res::ToolMod,
 Res::NonMacroAttr(attr_kind) => Res::NonMacroAttr(attr_kind),
@@ -926,8 +903,8 @@ impl<Id> Res<Id> {
 Res::PrimTy(id) => Res::PrimTy(id),
 Res::Local(id) => Res::Local(map(id)?),
 Res::SelfTyParam{ trait_ } => Res::SelfTyParam{ trait_ },
-Res::SelfTyAlias{ alias_to,forbid_generic,is_trait_impl } => {
-Res::SelfTyAlias{ alias_to,forbid_generic,is_trait_impl }
+Res::SelfTyAlias{ alias_to, is_trait_impl } => {
+Res::SelfTyAlias{ alias_to, is_trait_impl }
 }
 Res::ToolMod => Res::ToolMod,
 Res::NonMacroAttr(attr_kind) => Res::NonMacroAttr(attr_kind),

compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs

@@ -2149,7 +2149,7 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
 );
 self.check_param_uses_if_mcg(tcx.types.self_param, span,false)
 }
-Res::SelfTyAlias{alias_to: def_id,forbid_generic: _,.. } => {
+Res::SelfTyAlias{alias_to: def_id, .. } => {
 // `Self` in impl (we know the concrete type).
 assert_eq!(opt_self_ty,None);
 // Try to evaluate any array length constants.

compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs

@@ -559,6 +559,15 @@ pub(in crate::rmeta) fn provide(providers: &mut Providers) {
 .filter_map(|(cnum, data)| data.used().then_some(cnum)),
 )
 },
+duplicate_crate_names: |tcx,c:CrateNum| {
+let name = tcx.crate_name(c);
+ tcx.arena.alloc_from_iter(
+ tcx.crates(())
+.into_iter()
+.filter(|k| tcx.crate_name(**k) == name && **k != c)
+.map(|c| *c),
+)
+},
  ..providers.queries
 };
 provide_extern(&mut providers.extern_queries);

compiler/rustc_middle/src/query/mod.rs

@@ -2334,6 +2334,7 @@ rustc_queries! {
  eval_always
  desc {"fetching all foreign CrateNum instances"}
 }
+
 // Crates that are loaded non-speculatively (not for diagnostics or doc links).
 // FIXME: This is currently only used for collecting lang items, but should be used instead of
 // `crates` in most other cases too.
@@ -2342,6 +2343,14 @@ rustc_queries! {
  desc {"fetching `CrateNum`s for all crates loaded non-speculatively"}
 }
 
+/// All crates that share the same name as crate `c`.
+///
+/// This normally occurs when multiple versions of the same dependency are present in the
+/// dependency tree.
+ query duplicate_crate_names(c:CrateNum) -> &'tcx [CrateNum]{
+ desc {"fetching `CrateNum`s with same name as `{c:?}`"}
+}
+
 /// A list of all traits in a crate, used by rustdoc and error reporting.
  query traits(_:CrateNum) -> &'tcx [DefId]{
  desc {"fetching all traits in a crate"}

compiler/rustc_resolve/src/ident.rs

@@ -1286,7 +1286,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
 &mutself,
 rib_index:usize,
 rib_ident:Ident,
-mutres:Res,
+res:Res,
 finalize:Option<Span>,
 original_rib_ident_def:Ident,
 all_ribs:&[Rib<'ra>],
@@ -1439,44 +1439,28 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
 }
 
 RibKind::ConstantItem(trivial, _) => {
-ifletConstantHasGenerics::No(cause) = trivial {
-// HACK(min_const_generics): If we encounter `Self` in an anonymous
-// constant we can't easily tell if it's generic at this stage, so
-// we instead remember this and then enforce the self type to be
-// concrete later on.
-ifletRes::SelfTyAlias{
-alias_to: def,
-forbid_generic: _,
- is_trait_impl,
-} = res
-{
- res = Res::SelfTyAlias{
-alias_to: def,
-forbid_generic:true,
- is_trait_impl,
-}
-}else{
-ifletSome(span) = finalize {
-let error = match cause {
-NoConstantGenericsReason::IsEnumDiscriminant => {
-ResolutionError::ParamInEnumDiscriminant{
-name: rib_ident.name,
-param_kind:ParamKindInEnumDiscriminant::Type,
-}
+ifletConstantHasGenerics::No(cause) = trivial
+ && !matches!(res,Res::SelfTyAlias{ .. })
+{
+ifletSome(span) = finalize {
+let error = match cause {
+NoConstantGenericsReason::IsEnumDiscriminant => {
+ResolutionError::ParamInEnumDiscriminant{
+name: rib_ident.name,
+param_kind:ParamKindInEnumDiscriminant::Type,
 }
-NoConstantGenericsReason::NonTrivialConstArg => {
-ResolutionError::ParamInNonTrivialAnonConst{
-name: rib_ident.name,
-param_kind:
-ParamKindInNonTrivialAnonConst::Type,
-}
+}
+NoConstantGenericsReason::NonTrivialConstArg => {
+ResolutionError::ParamInNonTrivialAnonConst{
+name: rib_ident.name,
+param_kind:ParamKindInNonTrivialAnonConst::Type,
 }
-};
-let _:ErrorGuaranteed = self.report_error(span, error);
-}
-
-returnRes::Err;
+}
+};
+let _:ErrorGuaranteed = self.report_error(span, error);
 }
+
+returnRes::Err;
 }
 
 continue;

compiler/rustc_resolve/src/late.rs

@@ -2655,11 +2655,7 @@ impl<'a, 'ast, 'ra, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
  |this| {
 let item_def_id = this.r.local_def_id(item.id).to_def_id();
  this.with_self_rib(
-Res::SelfTyAlias{
-alias_to: item_def_id,
-forbid_generic:false,
-is_trait_impl:false,
-},
+Res::SelfTyAlias{alias_to: item_def_id,is_trait_impl:false},
  |this| {
  visit::walk_item(this, item);
 },
@@ -3368,8 +3364,7 @@ impl<'a, 'ast, 'ra, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
 let item_def_id = item_def_id.to_def_id();
 let res = Res::SelfTyAlias{
 alias_to: item_def_id,
-forbid_generic:false,
-is_trait_impl: trait_id.is_some()
+is_trait_impl: trait_id.is_some(),
 };
  this.with_self_rib(res, |this| {
 ifletSome(of_trait) = of_trait {

compiler/rustc_span/src/symbol.rs

@@ -1788,6 +1788,8 @@ symbols! {
  ptr_slice_from_raw_parts_mut,
  ptr_swap,
  ptr_swap_nonoverlapping,
+ ptr_without_provenance,
+ ptr_without_provenance_mut,
  ptr_write,
  ptr_write_bytes,
  ptr_write_unaligned,

compiler/rustc_target/src/target_features.rs

@@ -588,7 +588,7 @@ const NVPTX_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
 staticRISCV_FEATURES:&[(&str,Stability,ImpliedFeatures)] = &[
 // tidy-alphabetical-start
 ("a",Stable,&["zaamo","zalrsc"]),
-("b",Unstable(sym::riscv_target_feature),&["zba","zbb","zbs"]),
+("b",Stable,&["zba","zbb","zbs"]),
 ("c",Stable,&["zca"]),
 ("d",Unstable(sym::riscv_target_feature),&["f"]),
 ("e",Unstable(sym::riscv_target_feature),&[]),
@@ -646,24 +646,24 @@ static RISCV_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
 ("unaligned-scalar-mem",Unstable(sym::riscv_target_feature),&[]),
 ("unaligned-vector-mem",Unstable(sym::riscv_target_feature),&[]),
 ("v",Unstable(sym::riscv_target_feature),&["zvl128b","zve64d"]),
-("za64rs",Unstable(sym::riscv_target_feature),&["za128rs"]),// Za64rs ⊃ Za128rs
-("za128rs",Unstable(sym::riscv_target_feature),&[]),
-("zaamo",Unstable(sym::riscv_target_feature),&[]),
-("zabha",Unstable(sym::riscv_target_feature),&["zaamo"]),
-("zacas",Unstable(sym::riscv_target_feature),&["zaamo"]),
-("zalrsc",Unstable(sym::riscv_target_feature),&[]),
-("zama16b",Unstable(sym::riscv_target_feature),&[]),
-("zawrs",Unstable(sym::riscv_target_feature),&[]),
+("za64rs",Stable,&["za128rs"]),// Za64rs ⊃ Za128rs
+("za128rs",Stable,&[]),
+("zaamo",Stable,&[]),
+("zabha",Stable,&["zaamo"]),
+("zacas",Stable,&["zaamo"]),
+("zalrsc",Stable,&[]),
+("zama16b",Stable,&[]),
+("zawrs",Stable,&[]),
 ("zba",Stable,&[]),
 ("zbb",Stable,&[]),
 ("zbc",Stable,&["zbkc"]),// Zbc ⊃ Zbkc
 ("zbkb",Stable,&[]),
 ("zbkc",Stable,&[]),
 ("zbkx",Stable,&[]),
 ("zbs",Stable,&[]),
-("zca",Unstable(sym::riscv_target_feature),&[]),
-("zcb",Unstable(sym::riscv_target_feature),&["zca"]),
-("zcmop",Unstable(sym::riscv_target_feature),&["zca"]),
+("zca",Stable,&[]),
+("zcb",Stable,&["zca"]),
+("zcmop",Stable,&["zca"]),
 ("zdinx",Unstable(sym::riscv_target_feature),&["zfinx"]),
 ("zfa",Unstable(sym::riscv_target_feature),&["f"]),
 ("zfbfmin",Unstable(sym::riscv_target_feature),&["f"]),// and a subset of Zfhmin
@@ -672,22 +672,22 @@ static RISCV_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
 ("zfinx",Unstable(sym::riscv_target_feature),&["zicsr"]),
 ("zhinx",Unstable(sym::riscv_target_feature),&["zhinxmin"]),
 ("zhinxmin",Unstable(sym::riscv_target_feature),&["zfinx"]),
-("zic64b",Unstable(sym::riscv_target_feature),&[]),
-("zicbom",Unstable(sym::riscv_target_feature),&[]),
-("zicbop",Unstable(sym::riscv_target_feature),&[]),
-("zicboz",Unstable(sym::riscv_target_feature),&[]),
-("ziccamoa",Unstable(sym::riscv_target_feature),&[]),
-("ziccif",Unstable(sym::riscv_target_feature),&[]),
-("zicclsm",Unstable(sym::riscv_target_feature),&[]),
-("ziccrse",Unstable(sym::riscv_target_feature),&[]),
-("zicntr",Unstable(sym::riscv_target_feature),&["zicsr"]),
-("zicond",Unstable(sym::riscv_target_feature),&[]),
-("zicsr",Unstable(sym::riscv_target_feature),&[]),
-("zifencei",Unstable(sym::riscv_target_feature),&[]),
-("zihintntl",Unstable(sym::riscv_target_feature),&[]),
-("zihintpause",Unstable(sym::riscv_target_feature),&[]),
-("zihpm",Unstable(sym::riscv_target_feature),&["zicsr"]),
-("zimop",Unstable(sym::riscv_target_feature),&[]),
+("zic64b",Stable,&[]),
+("zicbom",Stable,&[]),
+("zicbop",Stable,&[]),
+("zicboz",Stable,&[]),
+("ziccamoa",Stable,&[]),
+("ziccif",Stable,&[]),
+("zicclsm",Stable,&[]),
+("ziccrse",Stable,&[]),
+("zicntr",Stable,&["zicsr"]),
+("zicond",Stable,&[]),
+("zicsr",Stable,&[]),
+("zifencei",Stable,&[]),
+("zihintntl",Stable,&[]),
+("zihintpause",Stable,&[]),
+("zihpm",Stable,&["zicsr"]),
+("zimop",Stable,&[]),
 ("zk",Stable,&["zkn","zkr","zkt"]),
 ("zkn",Stable,&["zbkb","zbkc","zbkx","zkne","zknd","zknh"]),
 ("zknd",Stable,&["zkne_or_zknd"]),
@@ -699,7 +699,7 @@ static RISCV_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
 ("zksed",Stable,&[]),
 ("zksh",Stable,&[]),
 ("zkt",Stable,&[]),
-("ztso",Unstable(sym::riscv_target_feature),&[]),
+("ztso",Stable,&[]),
 ("zvbb",Unstable(sym::riscv_target_feature),&["zvkb"]),// Zvbb ⊃ Zvkb
 ("zvbc",Unstable(sym::riscv_target_feature),&["zve64x"]),
 ("zve32f",Unstable(sym::riscv_target_feature),&["zve32x","f"]),

compiler/rustc_trait_selection/src/error_reporting/traits/fulfillment_errors.rs

@@ -33,6 +33,7 @@ use rustc_middle::ty::{
 TypeVisitableExt,Upcast,
 };
 use rustc_middle::{bug, span_bug};
+use rustc_span::def_id::CrateNum;
 use rustc_span::{BytePos,DUMMY_SP,STDLIB_STABLE_CRATES,Span,Symbol, sym};
 use tracing::{debug, instrument};
 
@@ -1287,10 +1288,6 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
 self.tcx.def_span(def.did()),
 format!("`{self_ty}` needs to implement `From<{ty}>`"),
 );
- err.span_note(
-self.tcx.def_span(found.did()),
-format!("alternatively, `{ty}` needs to implement `Into<{self_ty}>`"),
-);
 }
 (ty::Adt(def, _),None)if def.did().is_local() => {
 let trait_path = self.tcx.short_string(
@@ -2172,6 +2169,13 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
 self.suggest_function_pointers_impl(None,&exp_found, err);
 }
 
+iflet ty::Adt(def, _) = trait_pred.self_ty().skip_binder().peel_refs().kind()
+ && let crates = self.tcx.duplicate_crate_names(def.did().krate)
+ && !crates.is_empty()
+{
+self.note_two_crate_versions(def.did().krate,MultiSpan::new(), err);
+ err.help("you can use `cargo tree` to explore your dependency tree");
+}
 true
 })
 }){
@@ -2282,6 +2286,14 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
 }
 ));
 }
+
+iflet ty::Adt(def, _) = trait_pred.self_ty().skip_binder().peel_refs().kind()
+ && let crates = self.tcx.duplicate_crate_names(def.did().krate)
+ && !crates.is_empty()
+{
+self.note_two_crate_versions(def.did().krate,MultiSpan::new(), err);
+ err.help("you can use `cargo tree` to explore your dependency tree");
+}
 true
 };
 
@@ -2445,11 +2457,11 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
 
 pubfnnote_two_crate_versions(
 &self,
-did:DefId,
+krate:CrateNum,
 sp:implInto<MultiSpan>,
 err:&mutDiag<'_>,
 ){
-let crate_name = self.tcx.crate_name(did.krate);
+let crate_name = self.tcx.crate_name(krate);
 let crate_msg = format!(
 "there are multiple different versions of crate `{crate_name}` in the dependency graph"
 );
@@ -2514,7 +2526,7 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
 
 for(similar_item, _)in similar_items {
  err.span_help(self.tcx.def_span(similar_item),"item with same name found");
-self.note_two_crate_versions(similar_item,MultiSpan::new(), err);
+self.note_two_crate_versions(similar_item.krate,MultiSpan::new(), err);
 }
 }
 

compiler/rustc_codegen_ssa/src/back/metadata.rs

@@ -330,14 +330,12 @@ pub(super) fn elf_e_flags(architecture: Architecture, sess: &Session) -> u32 {
 letmut e_flags:u32 = 0x0;
 
 // Check if compression is enabled
-// `unstable_target_features` is used here because "zca" is gated behind riscv_target_feature.
-if sess.unstable_target_features.contains(&sym::zca){
+if sess.target_features.contains(&sym::zca){
  e_flags |= elf::EF_RISCV_RVC;
 }
 
 // Check if RVTSO is enabled
-// `unstable_target_features` is used here because "ztso" is gated behind riscv_target_feature.
-if sess.unstable_target_features.contains(&sym::ztso){
+if sess.target_features.contains(&sym::ztso){
  e_flags |= elf::EF_RISCV_TSO;
 }
 

compiler/rustc_hir/src/def.rs

@@ -563,29 +563,6 @@ pub enum Res<Id = hir::HirId> {
 /// to get the underlying type.
 alias_to:DefId,
 
-/// Whether the `Self` type is disallowed from mentioning generics (i.e. when used in an
-/// anonymous constant).
-///
-/// HACK(min_const_generics): self types also have an optional requirement to **not**
-/// mention any generic parameters to allow the following with `min_const_generics`:
-/// ```
-/// # struct Foo;
-/// impl Foo { fn test() -> [u8; size_of::<Self>()] { todo!() } }
-///
-/// struct Bar([u8; baz::<Self>()]);
-/// const fn baz<T>() -> usize { 10 }
-/// ```
-/// We do however allow `Self` in repeat expression even if it is generic to not break code
-/// which already works on stable while causing the `const_evaluatable_unchecked` future
-/// compat lint:
-/// ```
-/// fn foo<T>() {
-/// let _bar = [1_u8; size_of::<*mut T>()];
-/// }
-/// ```
-// FIXME(generic_const_exprs): Remove this bodge once that feature is stable.
-forbid_generic:bool,
-
 /// Is this within an `impl Foo for bar`?
 is_trait_impl:bool,
 },
@@ -910,8 +887,8 @@ impl<Id> Res<Id> {
 Res::PrimTy(id) => Res::PrimTy(id),
 Res::Local(id) => Res::Local(map(id)),
 Res::SelfTyParam{ trait_ } => Res::SelfTyParam{ trait_ },
-Res::SelfTyAlias{ alias_to,forbid_generic,is_trait_impl } => {
-Res::SelfTyAlias{ alias_to,forbid_generic,is_trait_impl }
+Res::SelfTyAlias{ alias_to, is_trait_impl } => {
+Res::SelfTyAlias{ alias_to, is_trait_impl }
 }
 Res::ToolMod => Res::ToolMod,
 Res::NonMacroAttr(attr_kind) => Res::NonMacroAttr(attr_kind),
@@ -926,8 +903,8 @@ impl<Id> Res<Id> {
 Res::PrimTy(id) => Res::PrimTy(id),
 Res::Local(id) => Res::Local(map(id)?),
 Res::SelfTyParam{ trait_ } => Res::SelfTyParam{ trait_ },
-Res::SelfTyAlias{ alias_to,forbid_generic,is_trait_impl } => {
-Res::SelfTyAlias{ alias_to,forbid_generic,is_trait_impl }
+Res::SelfTyAlias{ alias_to, is_trait_impl } => {
+Res::SelfTyAlias{ alias_to, is_trait_impl }
 }
 Res::ToolMod => Res::ToolMod,
 Res::NonMacroAttr(attr_kind) => Res::NonMacroAttr(attr_kind),

compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs

@@ -2149,7 +2149,7 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
 );
 self.check_param_uses_if_mcg(tcx.types.self_param, span,false)
 }
-Res::SelfTyAlias{alias_to: def_id,forbid_generic: _,.. } => {
+Res::SelfTyAlias{alias_to: def_id, .. } => {
 // `Self` in impl (we know the concrete type).
 assert_eq!(opt_self_ty,None);
 // Try to evaluate any array length constants.

compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs

@@ -559,6 +559,15 @@ pub(in crate::rmeta) fn provide(providers: &mut Providers) {
 .filter_map(|(cnum, data)| data.used().then_some(cnum)),
 )
 },
+duplicate_crate_names: |tcx,c:CrateNum| {
+let name = tcx.crate_name(c);
+ tcx.arena.alloc_from_iter(
+ tcx.crates(())
+.into_iter()
+.filter(|k| tcx.crate_name(**k) == name && **k != c)
+.map(|c| *c),
+)
+},
  ..providers.queries
 };
 provide_extern(&mut providers.extern_queries);

compiler/rustc_middle/src/query/mod.rs

@@ -2334,6 +2334,7 @@ rustc_queries! {
  eval_always
  desc {"fetching all foreign CrateNum instances"}
 }
+
 // Crates that are loaded non-speculatively (not for diagnostics or doc links).
 // FIXME: This is currently only used for collecting lang items, but should be used instead of
 // `crates` in most other cases too.
@@ -2342,6 +2343,14 @@ rustc_queries! {
  desc {"fetching `CrateNum`s for all crates loaded non-speculatively"}
 }
 
+/// All crates that share the same name as crate `c`.
+///
+/// This normally occurs when multiple versions of the same dependency are present in the
+/// dependency tree.
+ query duplicate_crate_names(c:CrateNum) -> &'tcx [CrateNum]{
+ desc {"fetching `CrateNum`s with same name as `{c:?}`"}
+}
+
 /// A list of all traits in a crate, used by rustdoc and error reporting.
  query traits(_:CrateNum) -> &'tcx [DefId]{
  desc {"fetching all traits in a crate"}

compiler/rustc_resolve/src/ident.rs

@@ -1286,7 +1286,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
 &mutself,
 rib_index:usize,
 rib_ident:Ident,
-mutres:Res,
+res:Res,
 finalize:Option<Span>,
 original_rib_ident_def:Ident,
 all_ribs:&[Rib<'ra>],
@@ -1439,44 +1439,28 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
 }
 
 RibKind::ConstantItem(trivial, _) => {
-ifletConstantHasGenerics::No(cause) = trivial {
-// HACK(min_const_generics): If we encounter `Self` in an anonymous
-// constant we can't easily tell if it's generic at this stage, so
-// we instead remember this and then enforce the self type to be
-// concrete later on.
-ifletRes::SelfTyAlias{
-alias_to: def,
-forbid_generic: _,
- is_trait_impl,
-} = res
-{
- res = Res::SelfTyAlias{
-alias_to: def,
-forbid_generic:true,
- is_trait_impl,
-}
-}else{
-ifletSome(span) = finalize {
-let error = match cause {
-NoConstantGenericsReason::IsEnumDiscriminant => {
-ResolutionError::ParamInEnumDiscriminant{
-name: rib_ident.name,
-param_kind:ParamKindInEnumDiscriminant::Type,
-}
+ifletConstantHasGenerics::No(cause) = trivial
+ && !matches!(res,Res::SelfTyAlias{ .. })
+{
+ifletSome(span) = finalize {
+let error = match cause {
+NoConstantGenericsReason::IsEnumDiscriminant => {
+ResolutionError::ParamInEnumDiscriminant{
+name: rib_ident.name,
+param_kind:ParamKindInEnumDiscriminant::Type,
 }
-NoConstantGenericsReason::NonTrivialConstArg => {
-ResolutionError::ParamInNonTrivialAnonConst{
-name: rib_ident.name,
-param_kind:
-ParamKindInNonTrivialAnonConst::Type,
-}
+}
+NoConstantGenericsReason::NonTrivialConstArg => {
+ResolutionError::ParamInNonTrivialAnonConst{
+name: rib_ident.name,
+param_kind:ParamKindInNonTrivialAnonConst::Type,
 }
-};
-let _:ErrorGuaranteed = self.report_error(span, error);
-}
-
-returnRes::Err;
+}
+};
+let _:ErrorGuaranteed = self.report_error(span, error);
 }
+
+returnRes::Err;
 }
 
 continue;

compiler/rustc_resolve/src/late.rs

@@ -2655,11 +2655,7 @@ impl<'a, 'ast, 'ra, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
  |this| {
 let item_def_id = this.r.local_def_id(item.id).to_def_id();
  this.with_self_rib(
-Res::SelfTyAlias{
-alias_to: item_def_id,
-forbid_generic:false,
-is_trait_impl:false,
-},
+Res::SelfTyAlias{alias_to: item_def_id,is_trait_impl:false},
  |this| {
  visit::walk_item(this, item);
 },
@@ -3368,8 +3364,7 @@ impl<'a, 'ast, 'ra, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
 let item_def_id = item_def_id.to_def_id();
 let res = Res::SelfTyAlias{
 alias_to: item_def_id,
-forbid_generic:false,
-is_trait_impl: trait_id.is_some()
+is_trait_impl: trait_id.is_some(),
 };
  this.with_self_rib(res, |this| {
 ifletSome(of_trait) = of_trait {

compiler/rustc_span/src/symbol.rs

@@ -1788,6 +1788,8 @@ symbols! {
  ptr_slice_from_raw_parts_mut,
  ptr_swap,
  ptr_swap_nonoverlapping,
+ ptr_without_provenance,
+ ptr_without_provenance_mut,
  ptr_write,
  ptr_write_bytes,
  ptr_write_unaligned,

compiler/rustc_target/src/target_features.rs

@@ -588,7 +588,7 @@ const NVPTX_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
 staticRISCV_FEATURES:&[(&str,Stability,ImpliedFeatures)] = &[
 // tidy-alphabetical-start
 ("a",Stable,&["zaamo","zalrsc"]),
-("b",Unstable(sym::riscv_target_feature),&["zba","zbb","zbs"]),
+("b",Stable,&["zba","zbb","zbs"]),
 ("c",Stable,&["zca"]),
 ("d",Unstable(sym::riscv_target_feature),&["f"]),
 ("e",Unstable(sym::riscv_target_feature),&[]),
@@ -646,24 +646,24 @@ static RISCV_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
 ("unaligned-scalar-mem",Unstable(sym::riscv_target_feature),&[]),
 ("unaligned-vector-mem",Unstable(sym::riscv_target_feature),&[]),
 ("v",Unstable(sym::riscv_target_feature),&["zvl128b","zve64d"]),
-("za64rs",Unstable(sym::riscv_target_feature),&["za128rs"]),// Za64rs ⊃ Za128rs
-("za128rs",Unstable(sym::riscv_target_feature),&[]),
-("zaamo",Unstable(sym::riscv_target_feature),&[]),
-("zabha",Unstable(sym::riscv_target_feature),&["zaamo"]),
-("zacas",Unstable(sym::riscv_target_feature),&["zaamo"]),
-("zalrsc",Unstable(sym::riscv_target_feature),&[]),
-("zama16b",Unstable(sym::riscv_target_feature),&[]),
-("zawrs",Unstable(sym::riscv_target_feature),&[]),
+("za64rs",Stable,&["za128rs"]),// Za64rs ⊃ Za128rs
+("za128rs",Stable,&[]),
+("zaamo",Stable,&[]),
+("zabha",Stable,&["zaamo"]),
+("zacas",Stable,&["zaamo"]),
+("zalrsc",Stable,&[]),
+("zama16b",Stable,&[]),
+("zawrs",Stable,&[]),
 ("zba",Stable,&[]),
 ("zbb",Stable,&[]),
 ("zbc",Stable,&["zbkc"]),// Zbc ⊃ Zbkc
 ("zbkb",Stable,&[]),
 ("zbkc",Stable,&[]),
 ("zbkx",Stable,&[]),
 ("zbs",Stable,&[]),
-("zca",Unstable(sym::riscv_target_feature),&[]),
-("zcb",Unstable(sym::riscv_target_feature),&["zca"]),
-("zcmop",Unstable(sym::riscv_target_feature),&["zca"]),
+("zca",Stable,&[]),
+("zcb",Stable,&["zca"]),
+("zcmop",Stable,&["zca"]),
 ("zdinx",Unstable(sym::riscv_target_feature),&["zfinx"]),
 ("zfa",Unstable(sym::riscv_target_feature),&["f"]),
 ("zfbfmin",Unstable(sym::riscv_target_feature),&["f"]),// and a subset of Zfhmin
@@ -672,22 +672,22 @@ static RISCV_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
 ("zfinx",Unstable(sym::riscv_target_feature),&["zicsr"]),
 ("zhinx",Unstable(sym::riscv_target_feature),&["zhinxmin"]),
 ("zhinxmin",Unstable(sym::riscv_target_feature),&["zfinx"]),
-("zic64b",Unstable(sym::riscv_target_feature),&[]),
-("zicbom",Unstable(sym::riscv_target_feature),&[]),
-("zicbop",Unstable(sym::riscv_target_feature),&[]),
-("zicboz",Unstable(sym::riscv_target_feature),&[]),
-("ziccamoa",Unstable(sym::riscv_target_feature),&[]),
-("ziccif",Unstable(sym::riscv_target_feature),&[]),
-("zicclsm",Unstable(sym::riscv_target_feature),&[]),
-("ziccrse",Unstable(sym::riscv_target_feature),&[]),
-("zicntr",Unstable(sym::riscv_target_feature),&["zicsr"]),
-("zicond",Unstable(sym::riscv_target_feature),&[]),
-("zicsr",Unstable(sym::riscv_target_feature),&[]),
-("zifencei",Unstable(sym::riscv_target_feature),&[]),
-("zihintntl",Unstable(sym::riscv_target_feature),&[]),
-("zihintpause",Unstable(sym::riscv_target_feature),&[]),
-("zihpm",Unstable(sym::riscv_target_feature),&["zicsr"]),
-("zimop",Unstable(sym::riscv_target_feature),&[]),
+("zic64b",Stable,&[]),
+("zicbom",Stable,&[]),
+("zicbop",Stable,&[]),
+("zicboz",Stable,&[]),
+("ziccamoa",Stable,&[]),
+("ziccif",Stable,&[]),
+("zicclsm",Stable,&[]),
+("ziccrse",Stable,&[]),
+("zicntr",Stable,&["zicsr"]),
+("zicond",Stable,&[]),
+("zicsr",Stable,&[]),
+("zifencei",Stable,&[]),
+("zihintntl",Stable,&[]),
+("zihintpause",Stable,&[]),
+("zihpm",Stable,&["zicsr"]),
+("zimop",Stable,&[]),
 ("zk",Stable,&["zkn","zkr","zkt"]),
 ("zkn",Stable,&["zbkb","zbkc","zbkx","zkne","zknd","zknh"]),
 ("zknd",Stable,&["zkne_or_zknd"]),
@@ -699,7 +699,7 @@ static RISCV_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
 ("zksed",Stable,&[]),
 ("zksh",Stable,&[]),
 ("zkt",Stable,&[]),
-("ztso",Unstable(sym::riscv_target_feature),&[]),
+("ztso",Stable,&[]),
 ("zvbb",Unstable(sym::riscv_target_feature),&["zvkb"]),// Zvbb ⊃ Zvkb
 ("zvbc",Unstable(sym::riscv_target_feature),&["zve64x"]),
 ("zve32f",Unstable(sym::riscv_target_feature),&["zve32x","f"]),

compiler/rustc_trait_selection/src/error_reporting/traits/fulfillment_errors.rs

@@ -33,6 +33,7 @@ use rustc_middle::ty::{
 TypeVisitableExt,Upcast,
 };
 use rustc_middle::{bug, span_bug};
+use rustc_span::def_id::CrateNum;
 use rustc_span::{BytePos,DUMMY_SP,STDLIB_STABLE_CRATES,Span,Symbol, sym};
 use tracing::{debug, instrument};
 
@@ -1287,10 +1288,6 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
 self.tcx.def_span(def.did()),
 format!("`{self_ty}` needs to implement `From<{ty}>`"),
 );
- err.span_note(
-self.tcx.def_span(found.did()),
-format!("alternatively, `{ty}` needs to implement `Into<{self_ty}>`"),
-);
 }
 (ty::Adt(def, _),None)if def.did().is_local() => {
 let trait_path = self.tcx.short_string(
@@ -2172,6 +2169,13 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
 self.suggest_function_pointers_impl(None,&exp_found, err);
 }
 
+iflet ty::Adt(def, _) = trait_pred.self_ty().skip_binder().peel_refs().kind()
+ && let crates = self.tcx.duplicate_crate_names(def.did().krate)
+ && !crates.is_empty()
+{
+self.note_two_crate_versions(def.did().krate,MultiSpan::new(), err);
+ err.help("you can use `cargo tree` to explore your dependency tree");
+}
 true
 })
 }){
@@ -2282,6 +2286,14 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
 }
 ));
 }
+
+iflet ty::Adt(def, _) = trait_pred.self_ty().skip_binder().peel_refs().kind()
+ && let crates = self.tcx.duplicate_crate_names(def.did().krate)
+ && !crates.is_empty()
+{
+self.note_two_crate_versions(def.did().krate,MultiSpan::new(), err);
+ err.help("you can use `cargo tree` to explore your dependency tree");
+}
 true
 };
 
@@ -2445,11 +2457,11 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
 
 pubfnnote_two_crate_versions(
 &self,
-did:DefId,
+krate:CrateNum,
 sp:implInto<MultiSpan>,
 err:&mutDiag<'_>,
 ){
-let crate_name = self.tcx.crate_name(did.krate);
+let crate_name = self.tcx.crate_name(krate);
 let crate_msg = format!(
 "there are multiple different versions of crate `{crate_name}` in the dependency graph"
 );
@@ -2514,7 +2526,7 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
 
 for(similar_item, _)in similar_items {
  err.span_help(self.tcx.def_span(similar_item),"item with same name found");
-self.note_two_crate_versions(similar_item,MultiSpan::new(), err);
+self.note_two_crate_versions(similar_item.krate,MultiSpan::new(), err);
 }
 }
 

compiler/rustc_codegen_ssa/src/back/metadata.rs

@@ -330,14 +330,12 @@ pub(super) fn elf_e_flags(architecture: Architecture, sess: &Session) -> u32 {
 letmut e_flags:u32 = 0x0;
 
 // Check if compression is enabled
-// `unstable_target_features` is used here because "zca" is gated behind riscv_target_feature.
-if sess.unstable_target_features.contains(&sym::zca){
+if sess.target_features.contains(&sym::zca){
  e_flags |= elf::EF_RISCV_RVC;
 }
 
 // Check if RVTSO is enabled
-// `unstable_target_features` is used here because "ztso" is gated behind riscv_target_feature.
-if sess.unstable_target_features.contains(&sym::ztso){
+if sess.target_features.contains(&sym::ztso){
  e_flags |= elf::EF_RISCV_TSO;
 }
 

compiler/rustc_hir/src/def.rs

@@ -563,29 +563,6 @@ pub enum Res<Id = hir::HirId> {
 /// to get the underlying type.
 alias_to:DefId,
 
-/// Whether the `Self` type is disallowed from mentioning generics (i.e. when used in an
-/// anonymous constant).
-///
-/// HACK(min_const_generics): self types also have an optional requirement to **not**
-/// mention any generic parameters to allow the following with `min_const_generics`:
-/// ```
-/// # struct Foo;
-/// impl Foo { fn test() -> [u8; size_of::<Self>()] { todo!() } }
-///
-/// struct Bar([u8; baz::<Self>()]);
-/// const fn baz<T>() -> usize { 10 }
-/// ```
-/// We do however allow `Self` in repeat expression even if it is generic to not break code
-/// which already works on stable while causing the `const_evaluatable_unchecked` future
-/// compat lint:
-/// ```
-/// fn foo<T>() {
-/// let _bar = [1_u8; size_of::<*mut T>()];
-/// }
-/// ```
-// FIXME(generic_const_exprs): Remove this bodge once that feature is stable.
-forbid_generic:bool,
-
 /// Is this within an `impl Foo for bar`?
 is_trait_impl:bool,
 },
@@ -910,8 +887,8 @@ impl<Id> Res<Id> {
 Res::PrimTy(id) => Res::PrimTy(id),
 Res::Local(id) => Res::Local(map(id)),
 Res::SelfTyParam{ trait_ } => Res::SelfTyParam{ trait_ },
-Res::SelfTyAlias{ alias_to,forbid_generic,is_trait_impl } => {
-Res::SelfTyAlias{ alias_to,forbid_generic,is_trait_impl }
+Res::SelfTyAlias{ alias_to, is_trait_impl } => {
+Res::SelfTyAlias{ alias_to, is_trait_impl }
 }
 Res::ToolMod => Res::ToolMod,
 Res::NonMacroAttr(attr_kind) => Res::NonMacroAttr(attr_kind),
@@ -926,8 +903,8 @@ impl<Id> Res<Id> {
 Res::PrimTy(id) => Res::PrimTy(id),
 Res::Local(id) => Res::Local(map(id)?),
 Res::SelfTyParam{ trait_ } => Res::SelfTyParam{ trait_ },
-Res::SelfTyAlias{ alias_to,forbid_generic,is_trait_impl } => {
-Res::SelfTyAlias{ alias_to,forbid_generic,is_trait_impl }
+Res::SelfTyAlias{ alias_to, is_trait_impl } => {
+Res::SelfTyAlias{ alias_to, is_trait_impl }
 }
 Res::ToolMod => Res::ToolMod,
 Res::NonMacroAttr(attr_kind) => Res::NonMacroAttr(attr_kind),

compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs

@@ -2149,7 +2149,7 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
 );
 self.check_param_uses_if_mcg(tcx.types.self_param, span,false)
 }
-Res::SelfTyAlias{alias_to: def_id,forbid_generic: _,.. } => {
+Res::SelfTyAlias{alias_to: def_id, .. } => {
 // `Self` in impl (we know the concrete type).
 assert_eq!(opt_self_ty,None);
 // Try to evaluate any array length constants.

compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs

@@ -559,6 +559,15 @@ pub(in crate::rmeta) fn provide(providers: &mut Providers) {
 .filter_map(|(cnum, data)| data.used().then_some(cnum)),
 )
 },
+duplicate_crate_names: |tcx,c:CrateNum| {
+let name = tcx.crate_name(c);
+ tcx.arena.alloc_from_iter(
+ tcx.crates(())
+.into_iter()
+.filter(|k| tcx.crate_name(**k) == name && **k != c)
+.map(|c| *c),
+)
+},
  ..providers.queries
 };
 provide_extern(&mut providers.extern_queries);

compiler/rustc_middle/src/query/mod.rs

@@ -2334,6 +2334,7 @@ rustc_queries! {
  eval_always
  desc {"fetching all foreign CrateNum instances"}
 }
+
 // Crates that are loaded non-speculatively (not for diagnostics or doc links).
 // FIXME: This is currently only used for collecting lang items, but should be used instead of
 // `crates` in most other cases too.
@@ -2342,6 +2343,14 @@ rustc_queries! {
  desc {"fetching `CrateNum`s for all crates loaded non-speculatively"}
 }
 
+/// All crates that share the same name as crate `c`.
+///
+/// This normally occurs when multiple versions of the same dependency are present in the
+/// dependency tree.
+ query duplicate_crate_names(c:CrateNum) -> &'tcx [CrateNum]{
+ desc {"fetching `CrateNum`s with same name as `{c:?}`"}
+}
+
 /// A list of all traits in a crate, used by rustdoc and error reporting.
  query traits(_:CrateNum) -> &'tcx [DefId]{
  desc {"fetching all traits in a crate"}

compiler/rustc_resolve/src/ident.rs

@@ -1286,7 +1286,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
 &mutself,
 rib_index:usize,
 rib_ident:Ident,
-mutres:Res,
+res:Res,
 finalize:Option<Span>,
 original_rib_ident_def:Ident,
 all_ribs:&[Rib<'ra>],
@@ -1439,44 +1439,28 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
 }
 
 RibKind::ConstantItem(trivial, _) => {
-ifletConstantHasGenerics::No(cause) = trivial {
-// HACK(min_const_generics): If we encounter `Self` in an anonymous
-// constant we can't easily tell if it's generic at this stage, so
-// we instead remember this and then enforce the self type to be
-// concrete later on.
-ifletRes::SelfTyAlias{
-alias_to: def,
-forbid_generic: _,
- is_trait_impl,
-} = res
-{
- res = Res::SelfTyAlias{
-alias_to: def,
-forbid_generic:true,
- is_trait_impl,
-}
-}else{
-ifletSome(span) = finalize {
-let error = match cause {
-NoConstantGenericsReason::IsEnumDiscriminant => {
-ResolutionError::ParamInEnumDiscriminant{
-name: rib_ident.name,
-param_kind:ParamKindInEnumDiscriminant::Type,
-}
+ifletConstantHasGenerics::No(cause) = trivial
+ && !matches!(res,Res::SelfTyAlias{ .. })
+{
+ifletSome(span) = finalize {
+let error = match cause {
+NoConstantGenericsReason::IsEnumDiscriminant => {
+ResolutionError::ParamInEnumDiscriminant{
+name: rib_ident.name,
+param_kind:ParamKindInEnumDiscriminant::Type,
 }
-NoConstantGenericsReason::NonTrivialConstArg => {
-ResolutionError::ParamInNonTrivialAnonConst{
-name: rib_ident.name,
-param_kind:
-ParamKindInNonTrivialAnonConst::Type,
-}
+}
+NoConstantGenericsReason::NonTrivialConstArg => {
+ResolutionError::ParamInNonTrivialAnonConst{
+name: rib_ident.name,
+param_kind:ParamKindInNonTrivialAnonConst::Type,
 }
-};
-let _:ErrorGuaranteed = self.report_error(span, error);
-}
-
-returnRes::Err;
+}
+};
+let _:ErrorGuaranteed = self.report_error(span, error);
 }
+
+returnRes::Err;
 }
 
 continue;

compiler/rustc_resolve/src/late.rs

@@ -2655,11 +2655,7 @@ impl<'a, 'ast, 'ra, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
  |this| {
 let item_def_id = this.r.local_def_id(item.id).to_def_id();
  this.with_self_rib(
-Res::SelfTyAlias{
-alias_to: item_def_id,
-forbid_generic:false,
-is_trait_impl:false,
-},
+Res::SelfTyAlias{alias_to: item_def_id,is_trait_impl:false},
  |this| {
  visit::walk_item(this, item);
 },
@@ -3368,8 +3364,7 @@ impl<'a, 'ast, 'ra, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
 let item_def_id = item_def_id.to_def_id();
 let res = Res::SelfTyAlias{
 alias_to: item_def_id,
-forbid_generic:false,
-is_trait_impl: trait_id.is_some()
+is_trait_impl: trait_id.is_some(),
 };
  this.with_self_rib(res, |this| {
 ifletSome(of_trait) = of_trait {

compiler/rustc_span/src/symbol.rs

@@ -1788,6 +1788,8 @@ symbols! {
  ptr_slice_from_raw_parts_mut,
  ptr_swap,
  ptr_swap_nonoverlapping,
+ ptr_without_provenance,
+ ptr_without_provenance_mut,
  ptr_write,
  ptr_write_bytes,
  ptr_write_unaligned,

compiler/rustc_target/src/target_features.rs

@@ -588,7 +588,7 @@ const NVPTX_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
 staticRISCV_FEATURES:&[(&str,Stability,ImpliedFeatures)] = &[
 // tidy-alphabetical-start
 ("a",Stable,&["zaamo","zalrsc"]),
-("b",Unstable(sym::riscv_target_feature),&["zba","zbb","zbs"]),
+("b",Stable,&["zba","zbb","zbs"]),
 ("c",Stable,&["zca"]),
 ("d",Unstable(sym::riscv_target_feature),&["f"]),
 ("e",Unstable(sym::riscv_target_feature),&[]),
@@ -646,24 +646,24 @@ static RISCV_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
 ("unaligned-scalar-mem",Unstable(sym::riscv_target_feature),&[]),
 ("unaligned-vector-mem",Unstable(sym::riscv_target_feature),&[]),
 ("v",Unstable(sym::riscv_target_feature),&["zvl128b","zve64d"]),
-("za64rs",Unstable(sym::riscv_target_feature),&["za128rs"]),// Za64rs ⊃ Za128rs
-("za128rs",Unstable(sym::riscv_target_feature),&[]),
-("zaamo",Unstable(sym::riscv_target_feature),&[]),
-("zabha",Unstable(sym::riscv_target_feature),&["zaamo"]),
-("zacas",Unstable(sym::riscv_target_feature),&["zaamo"]),
-("zalrsc",Unstable(sym::riscv_target_feature),&[]),
-("zama16b",Unstable(sym::riscv_target_feature),&[]),
-("zawrs",Unstable(sym::riscv_target_feature),&[]),
+("za64rs",Stable,&["za128rs"]),// Za64rs ⊃ Za128rs
+("za128rs",Stable,&[]),
+("zaamo",Stable,&[]),
+("zabha",Stable,&["zaamo"]),
+("zacas",Stable,&["zaamo"]),
+("zalrsc",Stable,&[]),
+("zama16b",Stable,&[]),
+("zawrs",Stable,&[]),
 ("zba",Stable,&[]),
 ("zbb",Stable,&[]),
 ("zbc",Stable,&["zbkc"]),// Zbc ⊃ Zbkc
 ("zbkb",Stable,&[]),
 ("zbkc",Stable,&[]),
 ("zbkx",Stable,&[]),
 ("zbs",Stable,&[]),
-("zca",Unstable(sym::riscv_target_feature),&[]),
-("zcb",Unstable(sym::riscv_target_feature),&["zca"]),
-("zcmop",Unstable(sym::riscv_target_feature),&["zca"]),
+("zca",Stable,&[]),
+("zcb",Stable,&["zca"]),
+("zcmop",Stable,&["zca"]),
 ("zdinx",Unstable(sym::riscv_target_feature),&["zfinx"]),
 ("zfa",Unstable(sym::riscv_target_feature),&["f"]),
 ("zfbfmin",Unstable(sym::riscv_target_feature),&["f"]),// and a subset of Zfhmin
@@ -672,22 +672,22 @@ static RISCV_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
 ("zfinx",Unstable(sym::riscv_target_feature),&["zicsr"]),
 ("zhinx",Unstable(sym::riscv_target_feature),&["zhinxmin"]),
 ("zhinxmin",Unstable(sym::riscv_target_feature),&["zfinx"]),
-("zic64b",Unstable(sym::riscv_target_feature),&[]),
-("zicbom",Unstable(sym::riscv_target_feature),&[]),
-("zicbop",Unstable(sym::riscv_target_feature),&[]),
-("zicboz",Unstable(sym::riscv_target_feature),&[]),
-("ziccamoa",Unstable(sym::riscv_target_feature),&[]),
-("ziccif",Unstable(sym::riscv_target_feature),&[]),
-("zicclsm",Unstable(sym::riscv_target_feature),&[]),
-("ziccrse",Unstable(sym::riscv_target_feature),&[]),
-("zicntr",Unstable(sym::riscv_target_feature),&["zicsr"]),
-("zicond",Unstable(sym::riscv_target_feature),&[]),
-("zicsr",Unstable(sym::riscv_target_feature),&[]),
-("zifencei",Unstable(sym::riscv_target_feature),&[]),
-("zihintntl",Unstable(sym::riscv_target_feature),&[]),
-("zihintpause",Unstable(sym::riscv_target_feature),&[]),
-("zihpm",Unstable(sym::riscv_target_feature),&["zicsr"]),
-("zimop",Unstable(sym::riscv_target_feature),&[]),
+("zic64b",Stable,&[]),
+("zicbom",Stable,&[]),
+("zicbop",Stable,&[]),
+("zicboz",Stable,&[]),
+("ziccamoa",Stable,&[]),
+("ziccif",Stable,&[]),
+("zicclsm",Stable,&[]),
+("ziccrse",Stable,&[]),
+("zicntr",Stable,&["zicsr"]),
+("zicond",Stable,&[]),
+("zicsr",Stable,&[]),
+("zifencei",Stable,&[]),
+("zihintntl",Stable,&[]),
+("zihintpause",Stable,&[]),
+("zihpm",Stable,&["zicsr"]),
+("zimop",Stable,&[]),
 ("zk",Stable,&["zkn","zkr","zkt"]),
 ("zkn",Stable,&["zbkb","zbkc","zbkx","zkne","zknd","zknh"]),
 ("zknd",Stable,&["zkne_or_zknd"]),
@@ -699,7 +699,7 @@ static RISCV_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
 ("zksed",Stable,&[]),
 ("zksh",Stable,&[]),
 ("zkt",Stable,&[]),
-("ztso",Unstable(sym::riscv_target_feature),&[]),
+("ztso",Stable,&[]),
 ("zvbb",Unstable(sym::riscv_target_feature),&["zvkb"]),// Zvbb ⊃ Zvkb
 ("zvbc",Unstable(sym::riscv_target_feature),&["zve64x"]),
 ("zve32f",Unstable(sym::riscv_target_feature),&["zve32x","f"]),

compiler/rustc_trait_selection/src/error_reporting/traits/fulfillment_errors.rs

@@ -33,6 +33,7 @@ use rustc_middle::ty::{
 TypeVisitableExt,Upcast,
 };
 use rustc_middle::{bug, span_bug};
+use rustc_span::def_id::CrateNum;
 use rustc_span::{BytePos,DUMMY_SP,STDLIB_STABLE_CRATES,Span,Symbol, sym};
 use tracing::{debug, instrument};
 
@@ -1287,10 +1288,6 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
 self.tcx.def_span(def.did()),
 format!("`{self_ty}` needs to implement `From<{ty}>`"),
 );
- err.span_note(
-self.tcx.def_span(found.did()),
-format!("alternatively, `{ty}` needs to implement `Into<{self_ty}>`"),
-);
 }
 (ty::Adt(def, _),None)if def.did().is_local() => {
 let trait_path = self.tcx.short_string(
@@ -2172,6 +2169,13 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
 self.suggest_function_pointers_impl(None,&exp_found, err);
 }
 
+iflet ty::Adt(def, _) = trait_pred.self_ty().skip_binder().peel_refs().kind()
+ && let crates = self.tcx.duplicate_crate_names(def.did().krate)
+ && !crates.is_empty()
+{
+self.note_two_crate_versions(def.did().krate,MultiSpan::new(), err);
+ err.help("you can use `cargo tree` to explore your dependency tree");
+}
 true
 })
 }){
@@ -2282,6 +2286,14 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
 }
 ));
 }
+
+iflet ty::Adt(def, _) = trait_pred.self_ty().skip_binder().peel_refs().kind()
+ && let crates = self.tcx.duplicate_crate_names(def.did().krate)
+ && !crates.is_empty()
+{
+self.note_two_crate_versions(def.did().krate,MultiSpan::new(), err);
+ err.help("you can use `cargo tree` to explore your dependency tree");
+}
 true
 };
 
@@ -2445,11 +2457,11 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
 
 pubfnnote_two_crate_versions(
 &self,
-did:DefId,
+krate:CrateNum,
 sp:implInto<MultiSpan>,
 err:&mutDiag<'_>,
 ){
-let crate_name = self.tcx.crate_name(did.krate);
+let crate_name = self.tcx.crate_name(krate);
 let crate_msg = format!(
 "there are multiple different versions of crate `{crate_name}` in the dependency graph"
 );
@@ -2514,7 +2526,7 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
 
 for(similar_item, _)in similar_items {
  err.span_help(self.tcx.def_span(similar_item),"item with same name found");
-self.note_two_crate_versions(similar_item,MultiSpan::new(), err);
+self.note_two_crate_versions(similar_item.krate,MultiSpan::new(), err);
 }
 }