Auto merge of rust-lang#3292 - rust-lang:rustup-2024-02-08, r=saethlin

Automatic Rustup

.github/workflows/ci.yml

@@ -364,8 +364,8 @@ jobs:
  os: macos-13
  - name: dist-aarch64-apple
  env:
- SCRIPT: "./x.py dist bootstrap --include-default-paths --stage 2"
- RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --host=aarch64-apple-darwin --target=aarch64-apple-darwin --enable-full-tools --enable-sanitizers --enable-profiler --disable-docs --set rust.jemalloc"
+ SCRIPT: "./x.py dist bootstrap --include-default-paths --host=aarch64-apple-darwin --target=aarch64-apple-darwin"
+ RUST_CONFIGURE_ARGS: "--enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false --set rust.lto=thin"
  RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
  SELECT_XCODE: /Applications/Xcode_13.4.1.app
  USE_XCODE_CLANG: 1
@@ -375,8 +375,20 @@ jobs:
  NO_DEBUG_ASSERTIONS: 1
  NO_OVERFLOW_CHECKS: 1
  DIST_REQUIRE_ALL_TOOLS: 1
- JEMALLOC_SYS_WITH_LG_PAGE: 14
- os: macos-13
+ os: macos-14
+ - name: aarch64-apple
+ env:
+ SCRIPT: "./x.py --stage 2 test --host=aarch64-apple-darwin --target=aarch64-apple-darwin"
+ RUST_CONFIGURE_ARGS: "--enable-sanitizers --enable-profiler --set rust.jemalloc"
+ RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
+ SELECT_XCODE: /Applications/Xcode_13.4.1.app
+ USE_XCODE_CLANG: 1
+ MACOSX_DEPLOYMENT_TARGET: 11.0
+ MACOSX_STD_DEPLOYMENT_TARGET: 11.0
+ NO_LLVM_ASSERTIONS: 1
+ NO_DEBUG_ASSERTIONS: 1
+ NO_OVERFLOW_CHECKS: 1
+ os: macos-14
  - name: x86_64-msvc
  env:
  RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler"

Cargo.lock

@@ -5321,6 +5321,7 @@ version = "0.0.0"
 dependencies = [
  "core",
  "getopts",
+ "libc",
  "panic_abort",
  "panic_unwind",
  "std",

compiler/rustc_ast_lowering/messages.ftl

@@ -123,9 +123,6 @@ ast_lowering_never_pattern_with_guard =
  a guard on a never pattern will never be run
  .suggestion = remove this guard
 
-ast_lowering_not_supported_for_lifetime_binder_async_closure =
- `for<...>` binders on `async` closures are not currently supported
-
 ast_lowering_previously_used_here = previously used here
 
 ast_lowering_register1 = register `{$reg1_name}`

compiler/rustc_ast_lowering/src/errors.rs

@@ -326,13 +326,6 @@ pub struct MisplacedRelaxTraitBound {
  pub span: Span,
 }
 
-#[derive(Diagnostic, Clone, Copy)]
-#[diag(ast_lowering_not_supported_for_lifetime_binder_async_closure)]
-pub struct NotSupportedForLifetimeBinderAsyncClosure {
- #[primary_span]
- pub span: Span,
-}
-
 #[derive(Diagnostic)]
 #[diag(ast_lowering_match_arm_with_no_body)]
 pub struct MatchArmWithNoBody {

compiler/rustc_ast_lowering/src/expr.rs

@@ -1,9 +1,10 @@
+use std::assert_matches::assert_matches;
+
 use super::errors::{
  AsyncCoroutinesNotSupported, AwaitOnlyInAsyncFnAndBlocks, BaseExpressionDoubleDot,
  ClosureCannotBeStatic, CoroutineTooManyParameters,
  FunctionalRecordUpdateDestructuringAssignment, InclusiveRangeWithNoEnd, MatchArmWithNoBody,
- NeverPatternWithBody, NeverPatternWithGuard, NotSupportedForLifetimeBinderAsyncClosure,
- UnderscoreExprLhsAssign,
+ NeverPatternWithBody, NeverPatternWithGuard, UnderscoreExprLhsAssign,
 };
 use super::ResolverAstLoweringExt;
 use super::{ImplTraitContext, LoweringContext, ParamMode, ParenthesizedGenericArgs};
@@ -1028,30 +1029,27 @@ impl<'hir> LoweringContext<'_, 'hir> {
  fn_decl_span: Span,
  fn_arg_span: Span,
  ) -> hir::ExprKind<'hir> {
- if let &ClosureBinder::For { span, .. } = binder {
- self.dcx().emit_err(NotSupportedForLifetimeBinderAsyncClosure { span });
- }
-
  let (binder_clause, generic_params) = self.lower_closure_binder(binder);
 
+ assert_matches!(
+ coroutine_kind,
+ CoroutineKind::Async { .. },
+ "only async closures are supported currently"
+ );
+
  let body = self.with_new_scopes(fn_decl_span, |this| {
+ let inner_decl =
+ FnDecl { inputs: decl.inputs.clone(), output: FnRetTy::Default(fn_decl_span) };
+
  // Transform `async |x: u8| -> X { ... }` into
  // `|x: u8| || -> X { ... }`.
  let body_id = this.lower_body(|this| {
- let async_ret_ty = if let FnRetTy::Ty(ty) = &decl.output {
- let itctx = ImplTraitContext::Disallowed(ImplTraitPosition::AsyncBlock);
- Some(hir::FnRetTy::Return(this.lower_ty(ty, &itctx)))
- } else {
- None
- };
-
  let (parameters, expr) = this.lower_coroutine_body_with_moved_arguments(
- decl,
+ &inner_decl,
  |this| this.with_new_scopes(fn_decl_span, |this| this.lower_expr_mut(body)),
  body.span,
  coroutine_kind,
  hir::CoroutineSource::Closure,
- async_ret_ty,
  );
 
  let hir_id = this.lower_node_id(coroutine_kind.closure_id());
@@ -1062,15 +1060,12 @@ impl<'hir> LoweringContext<'_, 'hir> {
  body_id
  });
 
- let outer_decl =
- FnDecl { inputs: decl.inputs.clone(), output: FnRetTy::Default(fn_decl_span) };
-
  let bound_generic_params = self.lower_lifetime_binder(closure_id, generic_params);
  // We need to lower the declaration outside the new scope, because we
  // have to conserve the state of being inside a loop condition for the
  // closure argument types.
  let fn_decl =
- self.lower_fn_decl(&outer_decl, closure_id, fn_decl_span, FnDeclKind::Closure, None);
+ self.lower_fn_decl(&decl, closure_id, fn_decl_span, FnDeclKind::Closure, None);
 
  let c = self.arena.alloc(hir::Closure {
  def_id: self.local_def_id(closure_id),
@@ -1081,7 +1076,10 @@ impl<'hir> LoweringContext<'_, 'hir> {
  body,
  fn_decl_span: self.lower_span(fn_decl_span),
  fn_arg_span: Some(self.lower_span(fn_arg_span)),
- kind: hir::ClosureKind::Closure,
+ // Lower this as a `CoroutineClosure`. That will ensure that HIR typeck
+ // knows that a `FnDecl` output type like `-> &str` actually means
+ // "coroutine that returns &str", rather than directly returning a `&str`.
+ kind: hir::ClosureKind::CoroutineClosure(hir::CoroutineDesugaring::Async),
  constness: hir::Constness::NotConst,
  });
  hir::ExprKind::Closure(c)

compiler/rustc_ast_lowering/src/item.rs

@@ -498,8 +498,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
  }
  }
 
- let res =
- self.expect_full_res_from_use(id).map(|res| self.lower_res(res)).collect();
+ let res = self.lower_import_res(id, path.span);
  let path = self.lower_use_path(res, &path, ParamMode::Explicit);
  hir::ItemKind::Use(path, hir::UseKind::Single)
  }
@@ -535,7 +534,8 @@ impl<'hir> LoweringContext<'_, 'hir> {
  // for that we return the `{}` import (called the
  // `ListStem`).
 
- let prefix = Path { segments, span: prefix.span.to(path.span), tokens: None };
+ let span = prefix.span.to(path.span);
+ let prefix = Path { segments, span, tokens: None };
 
  // Add all the nested `PathListItem`s to the HIR.
  for &(ref use_tree, id) in trees {
@@ -569,9 +569,16 @@ impl<'hir> LoweringContext<'_, 'hir> {
  });
  }
 
- let res =
- self.expect_full_res_from_use(id).map(|res| self.lower_res(res)).collect();
- let path = self.lower_use_path(res, &prefix, ParamMode::Explicit);
+ let path = if trees.is_empty() && !prefix.segments.is_empty() {
+ // For empty lists we need to lower the prefix so it is checked for things
+ // like stability later.
+ let res = self.lower_import_res(id, span);
+ self.lower_use_path(res, &prefix, ParamMode::Explicit)
+ } else {
+ // For non-empty lists we can just drop all the data, the prefix is already
+ // present in HIR as a part of nested imports.
+ self.arena.alloc(hir::UsePath { res: smallvec![], segments: &[], span })
+ };
  hir::ItemKind::Use(path, hir::UseKind::ListStem)
  }
  }
@@ -1091,7 +1098,6 @@ impl<'hir> LoweringContext<'_, 'hir> {
  body.span,
  coroutine_kind,
  hir::CoroutineSource::Fn,
- None,
  );
 
  // FIXME(async_fn_track_caller): Can this be moved above?
@@ -1113,7 +1119,6 @@ impl<'hir> LoweringContext<'_, 'hir> {
  body_span: Span,
  coroutine_kind: CoroutineKind,
  coroutine_source: hir::CoroutineSource,
- return_type_hint: Option<hir::FnRetTy<'hir>>,
  ) -> (&'hir [hir::Param<'hir>], hir::Expr<'hir>) {
  let mut parameters: Vec<hir::Param<'_>> = Vec::new();
  let mut statements: Vec<hir::Stmt<'_>> = Vec::new();
@@ -1283,12 +1288,13 @@ impl<'hir> LoweringContext<'_, 'hir> {
  };
  let closure_id = coroutine_kind.closure_id();
  let coroutine_expr = self.make_desugared_coroutine_expr(
- // FIXME(async_closures): This should only move locals,
- // and not upvars. Capturing closure upvars by ref doesn't
- // work right now anyways, so whatever.
- CaptureBy::Value { move_kw: rustc_span::DUMMY_SP },
+ // The default capture mode here is by-ref. Later on during upvar analysis,
+ // we will force the captured arguments to by-move, but for async closures,
+ // we want to make sure that we avoid unnecessarily moving captures, or else
+ // all async closures would default to `FnOnce` as their calling mode.
+ CaptureBy::Ref,
  closure_id,
- return_type_hint,
+ None,
  body_span,
  desugaring_kind,
  coroutine_source,

compiler/rustc_ast_lowering/src/lib.rs

@@ -33,6 +33,7 @@
 #![allow(internal_features)]
 #![feature(rustdoc_internals)]
 #![doc(rust_logo)]
+#![feature(assert_matches)]
 #![feature(box_patterns)]
 #![feature(let_chains)]
 #![deny(rustc::untranslatable_diagnostic)]
@@ -63,7 +64,7 @@ use rustc_middle::ty::{ResolverAstLowering, TyCtxt};
 use rustc_session::parse::{add_feature_diagnostics, feature_err};
 use rustc_span::symbol::{kw, sym, Ident, Symbol};
 use rustc_span::{DesugaringKind, Span, DUMMY_SP};
-use smallvec::SmallVec;
+use smallvec::{smallvec, SmallVec};
 use std::collections::hash_map::Entry;
 use thin_vec::ThinVec;
 
@@ -298,7 +299,6 @@ enum ImplTraitPosition {
  Path,
  Variable,
  Trait,
- AsyncBlock,
  Bound,
  Generic,
  ExternFnParam,
@@ -325,7 +325,6 @@ impl std::fmt::Display for ImplTraitPosition {
  ImplTraitPosition::Path => "paths",
  ImplTraitPosition::Variable => "the type of variable bindings",
  ImplTraitPosition::Trait => "traits",
- ImplTraitPosition::AsyncBlock => "async blocks",
  ImplTraitPosition::Bound => "bounds",
  ImplTraitPosition::Generic => "generics",
  ImplTraitPosition::ExternFnParam => "`extern fn` parameters",
@@ -751,8 +750,14 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
  self.resolver.get_partial_res(id).map_or(Res::Err, |pr| pr.expect_full_res())
  }
 
- fn expect_full_res_from_use(&mut self, id: NodeId) -> impl Iterator<Item = Res<NodeId>> {
- self.resolver.get_import_res(id).present_items()
+ fn lower_import_res(&mut self, id: NodeId, span: Span) -> SmallVec<[Res; 3]> {
+ let res = self.resolver.get_import_res(id).present_items();
+ let res: SmallVec<_> = res.map(|res| self.lower_res(res)).collect();
+ if res.is_empty() {
+ self.dcx().span_delayed_bug(span, "no resolution for an import");
+ return smallvec![Res::Err];
+ }
+ res
  }
 
  fn make_lang_item_qpath(&mut self, lang_item: hir::LangItem, span: Span) -> hir::QPath<'hir> {

compiler/rustc_ast_lowering/src/path.rs

@@ -196,6 +196,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
  p: &Path,
  param_mode: ParamMode,
  ) -> &'hir hir::UsePath<'hir> {
+ assert!((1..=3).contains(&res.len()));
  self.arena.alloc(hir::UsePath {
  res,
  segments: self.arena.alloc_from_iter(p.segments.iter().map(|segment| {

compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs

@@ -858,7 +858,9 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
  use crate::session_diagnostics::CaptureVarCause::*;
  match kind {
  hir::ClosureKind::Coroutine(_) => MoveUseInCoroutine { var_span },
- hir::ClosureKind::Closure => MoveUseInClosure { var_span },
+ hir::ClosureKind::Closure | hir::ClosureKind::CoroutineClosure(_) => {
+ MoveUseInClosure { var_span }
+ }
  }
  });
 
@@ -905,7 +907,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
  hir::ClosureKind::Coroutine(_) => {
  BorrowUsePlaceCoroutine { place: desc_place, var_span, is_single_var: true }
  }
- hir::ClosureKind::Closure => {
+ hir::ClosureKind::Closure | hir::ClosureKind::CoroutineClosure(_) => {
  BorrowUsePlaceClosure { place: desc_place, var_span, is_single_var: true }
  }
  }
@@ -1056,7 +1058,8 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
  var_span,
  is_single_var: true,
  },
- hir::ClosureKind::Closure => BorrowUsePlaceClosure {
+ hir::ClosureKind::Closure
+ | hir::ClosureKind::CoroutineClosure(_) => BorrowUsePlaceClosure {
  place: desc_place,
  var_span,
  is_single_var: true,
@@ -1140,7 +1143,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
  var_span,
  is_single_var: false,
  },
- hir::ClosureKind::Closure => {
+ hir::ClosureKind::Closure | hir::ClosureKind::CoroutineClosure(_) => {
  BorrowUsePlaceClosure { place: desc_place, var_span, is_single_var: false }
  }
  }
@@ -1158,7 +1161,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
  hir::ClosureKind::Coroutine(_) => {
  FirstBorrowUsePlaceCoroutine { place: borrow_place_desc, var_span }
  }
- hir::ClosureKind::Closure => {
+ hir::ClosureKind::Closure | hir::ClosureKind::CoroutineClosure(_) => {
  FirstBorrowUsePlaceClosure { place: borrow_place_desc, var_span }
  }
  }
@@ -1175,7 +1178,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
  hir::ClosureKind::Coroutine(_) => {
  SecondBorrowUsePlaceCoroutine { place: desc_place, var_span }
  }
- hir::ClosureKind::Closure => {
+ hir::ClosureKind::Closure | hir::ClosureKind::CoroutineClosure(_) => {
  SecondBorrowUsePlaceClosure { place: desc_place, var_span }
  }
  }
@@ -2942,7 +2945,9 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
  use crate::session_diagnostics::CaptureVarCause::*;
  match kind {
  hir::ClosureKind::Coroutine(_) => BorrowUseInCoroutine { var_span },
- hir::ClosureKind::Closure => BorrowUseInClosure { var_span },
+ hir::ClosureKind::Closure | hir::ClosureKind::CoroutineClosure(_) => {
+ BorrowUseInClosure { var_span }
+ }
  }
  });
 
@@ -2958,7 +2963,9 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
  use crate::session_diagnostics::CaptureVarCause::*;
  match kind {
  hir::ClosureKind::Coroutine(_) => BorrowUseInCoroutine { var_span },
- hir::ClosureKind::Closure => BorrowUseInClosure { var_span },
+ hir::ClosureKind::Closure | hir::ClosureKind::CoroutineClosure(_) => {
+ BorrowUseInClosure { var_span }
+ }
  }
  });
 

compiler/rustc_borrowck/src/diagnostics/mod.rs

@@ -614,7 +614,7 @@ impl UseSpans<'_> {
  PartialAssignment => AssignPartInCoroutine { path_span },
  });
  }
- hir::ClosureKind::Closure => {
+ hir::ClosureKind::Closure | hir::ClosureKind::CoroutineClosure(_) => {
  err.subdiagnostic(match action {
  Borrow => BorrowInClosure { path_span },
  MatchOn | Use => UseInClosure { path_span },
@@ -1253,7 +1253,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
  hir::ClosureKind::Coroutine(_) => {
  CaptureVarCause::PartialMoveUseInCoroutine { var_span, is_partial }
  }
- hir::ClosureKind::Closure => {
+ hir::ClosureKind::Closure | hir::ClosureKind::CoroutineClosure(_) => {
  CaptureVarCause::PartialMoveUseInClosure { var_span, is_partial }
  }
  })

compiler/rustc_borrowck/src/diagnostics/mutability_errors.rs

@@ -1472,7 +1472,7 @@ fn suggest_ampmut<'tcx>(
 }
 
 fn is_closure_or_coroutine(ty: Ty<'_>) -> bool {
- ty.is_closure() || ty.is_coroutine()
+ ty.is_closure() || ty.is_coroutine() || ty.is_coroutine_closure()
 }
 
 /// Given a field that needs to be mutable, returns a span where the " mut " could go.