Auto merge of #131869 - matthiaskrgr:rollup-xrkz174, r=matthiaskrgr

Rollup of 5 pull requests
Successful merges:
- #131654 (Various fixes for Xous)
- #131743 (rustc_metadata: minor tidying)
- #131823 (Bump libc to 0.2.161)
- #131850 (Missing parenthesis)
- #131857 (Allow dropping dyn principal)
r? `@ghost`
`@rustbot` modify labels: rollup

Author: bors

compiler/rustc_codegen_cranelift/src/unsize.rs

@@ -34,7 +34,9 @@ pub(crate) fn unsized_info<'tcx>(
 {
 let old_info =
  old_info.expect("unsized_info: missing old info for trait upcasting coercion");
-if data_a.principal_def_id() == data_b.principal_def_id(){
+let b_principal_def_id = data_b.principal_def_id();
+if data_a.principal_def_id() == b_principal_def_id || b_principal_def_id.is_none(){
+// A NOP cast that doesn't actually change anything, should be allowed even with invalid vtables.
 debug_assert!(
  validate_trivial_unsize(fx.tcx, data_a, data_b),
 "NOP unsize vtable changed principal trait ref: {data_a} -> {data_b}"

compiler/rustc_codegen_ssa/src/base.rs

@@ -147,7 +147,7 @@ pub fn validate_trivial_unsize<'tcx>(
  infcx.leak_check(universe,None).is_ok()
 })
 }
-(None,None) => true,
+(_,None) => true,
  _ => false,
 }
 }
@@ -175,7 +175,8 @@ fn unsized_info<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>>(
 {
 let old_info =
  old_info.expect("unsized_info: missing old info for trait upcasting coercion");
-if data_a.principal_def_id() == data_b.principal_def_id(){
+let b_principal_def_id = data_b.principal_def_id();
+if data_a.principal_def_id() == b_principal_def_id || b_principal_def_id.is_none(){
 // Codegen takes advantage of the additional assumption, where if the
 // principal trait def id of what's being casted doesn't change,
 // then we don't need to adjust the vtable at all. This

compiler/rustc_metadata/src/locator.rs

@@ -499,8 +499,11 @@ impl<'a> CrateLocator<'a> {
 dylibs:FxIndexMap<PathBuf,PathKind>,
 ) -> Result<Option<(Svh,Library)>,CrateError>{
 letmut slot = None;
-// Order here matters, rmeta should come first. See comment in
-// `extract_one` below.
+// Order here matters, rmeta should come first.
+//
+// Make sure there's at most one rlib and at most one dylib.
+//
+// See comment in `extract_one` below.
 let source = CrateSource{
 rmeta:self.extract_one(rmetas,CrateFlavor::Rmeta,&mut slot)?,
 rlib:self.extract_one(rlibs,CrateFlavor::Rlib,&mut slot)?,
@@ -706,54 +709,58 @@ impl<'a> CrateLocator<'a> {
 letmut rmetas = FxIndexMap::default();
 letmut dylibs = FxIndexMap::default();
 for loc in&self.exact_paths{
-if !loc.canonicalized().exists(){
-returnErr(CrateError::ExternLocationNotExist(
-self.crate_name,
- loc.original().clone(),
-));
+let loc_canon = loc.canonicalized();
+let loc_orig = loc.original();
+if !loc_canon.exists(){
+returnErr(CrateError::ExternLocationNotExist(self.crate_name, loc_orig.clone()));
 }
-if !loc.original().is_file(){
-returnErr(CrateError::ExternLocationNotFile(
-self.crate_name,
- loc.original().clone(),
-));
+if !loc_orig.is_file(){
+returnErr(CrateError::ExternLocationNotFile(self.crate_name, loc_orig.clone()));
 }
-letSome(file) = loc.original().file_name().and_then(|s| s.to_str())else{
-returnErr(CrateError::ExternLocationNotFile(
-self.crate_name,
- loc.original().clone(),
-));
+// Note to take care and match against the non-canonicalized name:
+// some systems save build artifacts into content-addressed stores
+// that do not preserve extensions, and then link to them using
+// e.g. symbolic links. If we canonicalize too early, we resolve
+// the symlink, the file type is lost and we might treat rlibs and
+// rmetas as dylibs.
+letSome(file) = loc_orig.file_name().and_then(|s| s.to_str())else{
+returnErr(CrateError::ExternLocationNotFile(self.crate_name, loc_orig.clone()));
 };
-
-if file.starts_with("lib") && (file.ends_with(".rlib") || file.ends_with(".rmeta"))
- || file.starts_with(self.target.dll_prefix.as_ref())
- && file.ends_with(self.target.dll_suffix.as_ref())
-{
-// Make sure there's at most one rlib and at most one dylib.
-// Note to take care and match against the non-canonicalized name:
-// some systems save build artifacts into content-addressed stores
-// that do not preserve extensions, and then link to them using
-// e.g. symbolic links. If we canonicalize too early, we resolve
-// the symlink, the file type is lost and we might treat rlibs and
-// rmetas as dylibs.
-let loc_canon = loc.canonicalized().clone();
-let loc = loc.original();
-if loc.file_name().unwrap().to_str().unwrap().ends_with(".rlib"){
- rlibs.insert(loc_canon,PathKind::ExternFlag);
-}elseif loc.file_name().unwrap().to_str().unwrap().ends_with(".rmeta"){
- rmetas.insert(loc_canon,PathKind::ExternFlag);
-}else{
- dylibs.insert(loc_canon,PathKind::ExternFlag);
+// FnMut cannot return reference to captured value, so references
+// must be taken outside the closure.
+let rlibs = &mut rlibs;
+let rmetas = &mut rmetas;
+let dylibs = &mut dylibs;
+let type_via_filename = (|| {
+if file.starts_with("lib"){
+if file.ends_with(".rlib"){
+returnSome(rlibs);
+}
+if file.ends_with(".rmeta"){
+returnSome(rmetas);
+}
+}
+let dll_prefix = self.target.dll_prefix.as_ref();
+let dll_suffix = self.target.dll_suffix.as_ref();
+if file.starts_with(dll_prefix) && file.ends_with(dll_suffix){
+returnSome(dylibs);
+}
+None
+})();
+match type_via_filename {
+Some(type_via_filename) => {
+ type_via_filename.insert(loc_canon.clone(),PathKind::ExternFlag);
+}
+None => {
+self.crate_rejections
+.via_filename
+.push(CrateMismatch{path: loc_orig.clone(),got:String::new()});
 }
-}else{
-self.crate_rejections
-.via_filename
-.push(CrateMismatch{path: loc.original().clone(),got:String::new()});
 }
 }
 
 // Extract the dylib/rlib/rmeta triple.
-Ok(self.extract_lib(rlibs, rmetas, dylibs)?.map(|(_, lib)| lib))
+self.extract_lib(rlibs, rmetas, dylibs).map(|opt| opt.map(|(_, lib)| lib))
 }
 
 pub(crate)fninto_error(self,root:Option<CratePaths>) -> CrateError{

compiler/rustc_next_trait_solver/src/solve/trait_goals.rs

@@ -785,7 +785,8 @@ where
 letmut responses = vec![];
 // If the principal def ids match (or are both none), then we're not doing
 // trait upcasting. We're just removing auto traits (or shortening the lifetime).
-if a_data.principal_def_id() == b_data.principal_def_id(){
+let b_principal_def_id = b_data.principal_def_id();
+if a_data.principal_def_id() == b_principal_def_id || b_principal_def_id.is_none(){
  responses.extend(self.consider_builtin_upcast_to_principal(
  goal,
 CandidateSource::BuiltinImpl(BuiltinImplSource::Misc),

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

@@ -1018,7 +1018,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
 // #2 (region bounds).
 let principal_def_id_a = a_data.principal_def_id();
 let principal_def_id_b = b_data.principal_def_id();
-if principal_def_id_a == principal_def_id_b {
+if principal_def_id_a == principal_def_id_b || principal_def_id_b.is_none(){
 // We may upcast to auto traits that are either explicitly listed in
 // the object type's bounds, or implied by the principal trait ref's
 // supertraits.

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

@@ -1153,6 +1153,10 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
 // We already checked the compatibility of auto traits within `assemble_candidates_for_unsizing`.
 let iter = data_a
 .principal()
+.filter(|_| {
+// optionally drop the principal, if we're unsizing to no principal
+ data_b.principal().is_some()
+})
 .map(|b| b.map_bound(ty::ExistentialPredicate::Trait))
 .into_iter()
 .chain(

library/Cargo.lock

@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "addr2line"
@@ -124,9 +124,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.30.0"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e1d97fbe9722ba9bbd0c97051c2956e726562b61f86a25a4360398a40edfc9"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 dependencies = [
 "compiler_builtins",
 "rustc-std-workspace-alloc",
@@ -158,9 +158,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.159"
+version = "0.2.161"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
+checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
 dependencies = [
 "rustc-std-workspace-core",
 ]
@@ -406,12 +406,12 @@ dependencies = [
 
 [[package]]
 name = "unwinding"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc55842d0db6329a669d55a623c674b02d677b16bfb2d24857d4089d41eba882"
+checksum = "637d511437df708cee34bdec7ba2f1548d256b7acf3ff20e0a1c559f9bf3a987"
 dependencies = [
 "compiler_builtins",
-"gimli 0.30.0",
+"gimli 0.31.1",
 "rustc-std-workspace-core",
 ]
 

library/core/src/macros/mod.rs

@@ -1550,7 +1550,7 @@ pub(crate) mod builtin {
 /// MODE is any of Forward, Reverse, ForwardFirst, ReverseFirst.
 /// INPUT_ACTIVITIES consists of one valid activity for each input parameter.
 /// OUTPUT_ACTIVITY must not be set if we implicitely return nothing (or explicitely return
-/// `-> ()`. Otherwise it must be set to one of the allowed activities.
+/// `-> ()`). Otherwise it must be set to one of the allowed activities.
  #[unstable(feature = "autodiff", issue = "124509")]
  #[allow_internal_unstable(rustc_attrs)]
  #[rustc_builtin_macro]

library/std/Cargo.toml

@@ -39,7 +39,7 @@ miniz_oxide = { version = "0.7.0", optional = true, default-features = false }
 addr2line = { version = "0.22.0", optional = true, default-features = false }
 
 [target.'cfg(not(all(windows,target_env="msvc")))'.dependencies]
-libc = { version = "0.2.159", default-features = false, features = [
+libc = { version = "0.2.161", default-features = false, features = [
 'rustc-dep-of-std',
 ], public = true }
 

library/std/src/os/xous/ffi.rs

@@ -615,7 +615,7 @@ pub(crate) fn thread_id() -> Result<ThreadId, Error> {
 /// An error is generated if the `knob` is not a valid limit, or if the call
 /// would not succeed.
 pub(crate)fnadjust_limit(knob:Limits,current:usize,new:usize) -> Result<usize,Error>{
-letmut a0 = Syscall::JoinThreadasusize;
+letmut a0 = Syscall::AdjustProcessLimitasusize;
 letmut a1 = knob asusize;
 let a2 = current;
 let a3 = new;