Rollup of 3 pull requests

compiler/rustc_middle/src/ty/context.rs

@@ -569,6 +569,7 @@ pub struct GlobalCtxt<'tcx> {
 
  /// Caches the results of goal evaluation in the new solver.
  pub new_solver_evaluation_cache: solve::EvaluationCache<'tcx>,
+ pub new_solver_coherence_evaluation_cache: solve::EvaluationCache<'tcx>,
 
  /// Data layout specification for the current target.
  pub data_layout: TargetDataLayout,
@@ -680,10 +681,12 @@ impl<'tcx> TyCtxt<'tcx> {
  value.lift_to_tcx(self)
  }
 
- /// Creates a type context and call the closure with a `TyCtxt` reference
- /// to the context. The closure enforces that the type context and any interned
- /// value (types, args, etc.) can only be used while `ty::tls` has a valid
- /// reference to the context, to allow formatting values that need it.
+ /// Creates a type context. To use the context call `fn enter` which
+ /// provides a `TyCtxt`.
+ ///
+ /// By only providing the `TyCtxt` inside of the closure we enforce that the type
+ /// context and any interned alue (types, args, etc.) can only be used while `ty::tls`
+ /// has a valid reference to the context, to allow formatting values that need it.
  pub fn create_global_ctxt(
  s: &'tcx Session,
  lint_store: Lrc<dyn Any + sync::DynSend + sync::DynSync>,
@@ -721,6 +724,7 @@ impl<'tcx> TyCtxt<'tcx> {
  selection_cache: Default::default(),
  evaluation_cache: Default::default(),
  new_solver_evaluation_cache: Default::default(),
+ new_solver_coherence_evaluation_cache: Default::default(),
  data_layout,
  alloc_map: Lock::new(interpret::AllocMap::new()),
  }

compiler/rustc_target/src/abi/mod.rs

@@ -140,24 +140,3 @@ impl<'a, Ty> TyAndLayout<'a, Ty> {
  offset
  }
 }
-
-impl<'a, Ty> TyAndLayout<'a, Ty> {
- /// Returns `true` if the layout corresponds to an unsized type.
- pub fn is_unsized(&self) -> bool {
- self.abi.is_unsized()
- }
-
- #[inline]
- pub fn is_sized(&self) -> bool {
- self.abi.is_sized()
- }
-
- /// Returns `true` if the type is a ZST and not unsized.
- pub fn is_zst(&self) -> bool {
- match self.abi {
- Abi::Scalar(_) | Abi::ScalarPair(..) | Abi::Vector { .. } => false,
- Abi::Uninhabited => self.size.bytes() == 0,
- Abi::Aggregate { sized } => sized && self.size.bytes() == 0,
- }
- }
-}

compiler/rustc_trait_selection/src/solve/search_graph/mod.rs

@@ -9,7 +9,9 @@ use cache::ProvisionalCache;
 use overflow::OverflowData;
 use rustc_index::IndexVec;
 use rustc_middle::dep_graph::DepKind;
-use rustc_middle::traits::solve::{CanonicalInput, Certainty, MaybeCause, QueryResult};
+use rustc_middle::traits::solve::{
+ CanonicalInput, Certainty, EvaluationCache, MaybeCause, QueryResult,
+};
 use rustc_middle::ty::TyCtxt;
 use std::{collections::hash_map::Entry, mem};
 
@@ -58,10 +60,10 @@ impl<'tcx> SearchGraph<'tcx> {
  ///
  /// We could add another global cache for coherence instead,
  /// but that's effort so let's only do it if necessary.
- pub(super) fn should_use_global_cache(&self) -> bool {
+ pub(super) fn global_cache(&self, tcx: TyCtxt<'tcx>) -> &'tcx EvaluationCache<'tcx> {
  match self.mode {
- SolverMode::Normal => true,
- SolverMode::Coherence => false,
+ SolverMode::Normal => &tcx.new_solver_evaluation_cache,
+ SolverMode::Coherence => &tcx.new_solver_coherence_evaluation_cache,
  }
  }
 
@@ -213,8 +215,8 @@ impl<'tcx> SearchGraph<'tcx> {
  inspect: &mut ProofTreeBuilder<'tcx>,
  mut loop_body: impl FnMut(&mut Self, &mut ProofTreeBuilder<'tcx>) -> QueryResult<'tcx>,
  ) -> QueryResult<'tcx> {
- if self.should_use_global_cache() && inspect.use_global_cache() {
- if let Some(result) = tcx.new_solver_evaluation_cache.get(&canonical_input, tcx) {
+ if inspect.use_global_cache() {
+ if let Some(result) = self.global_cache(tcx).get(&canonical_input, tcx) {
  debug!(?canonical_input, ?result, "cache hit");
  inspect.cache_hit(CacheHit::Global);
  return result;
@@ -278,13 +280,10 @@ impl<'tcx> SearchGraph<'tcx> {
  // dependencies, our non-root goal may no longer appear as child of the root goal.
  //
  // See https://github.com/rust-lang/rust/pull/108071 for some additional context.
- let can_cache = !self.overflow_data.did_overflow() || self.stack.is_empty();
- if self.should_use_global_cache() && can_cache {
- tcx.new_solver_evaluation_cache.insert(
- current_goal.input,
- dep_node,
- current_goal.response,
- );
+ let can_cache = inspect.use_global_cache()
+ && (!self.overflow_data.did_overflow() || self.stack.is_empty());
+ if can_cache {
+ self.global_cache(tcx).insert(current_goal.input, dep_node, current_goal.response)
  }
  }
 

src/doc/style-guide/src/README.md

@@ -37,8 +37,8 @@ options.
 ### Indentation and line width
 
 * Use spaces, not tabs.
-* Each level of indentation must be four spaces (that is, all indentation
- outside of string literals and comments must be a multiple of four).
+* Each level of indentation must be 4 spaces (that is, all indentation
+ outside of string literals and comments must be a multiple of 4).
 * The maximum width for a line is 100 characters.
 
 #### Block indent

src/doc/style-guide/src/expressions.md

@@ -64,8 +64,8 @@ Write an empty block as `{}`.
 Write a block on a single line if:
 
 * it is either used in expression position (not statement position) or is an
- unsafe block in statement position
-* it contains a single-line expression and no statements
+ unsafe block in statement position,
+* it contains a single-line expression and no statements, and
 * it contains no comments
 
 For a single-line block, put spaces after the opening brace and before the
@@ -125,9 +125,9 @@ expression of the closure. Between the `|`s, use function definition syntax,
 but elide types where possible.
 
 Use closures without the enclosing `{}`, if possible. Add the `{}` when you have
-a return type, when there are statements, there are comments in the body, or the
-body expression spans multiple lines and is a control-flow expression. If using
-braces, follow the rules above for blocks. Examples:
+a return type, when there are statements, when there are comments inside the
+closure, or when the body expression is a control-flow expression that spans
+multiple lines. If using braces, follow the rules above for blocks. Examples:
 
 ```rust
 |arg1, arg2| expr
@@ -178,10 +178,12 @@ let f = Foo {
 Functional record update syntax is treated like a field, but it must never have
 a trailing comma. Do not put a space after `..`.
 
+```rust
 let f = Foo {
  field1,
  ..an_expr
 };
+```
 
 
 ### Tuple literals