Add check for ui_testing via promoting parameters from ParseSess to Session

Author: George-lewis

compiler/rustc_ast_lowering/src/asm.rs

@@ -48,7 +48,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
  );
  if !is_stable && !self.tcx.features().asm_experimental_arch {
  feature_err(
- &self.tcx.sess.parse_sess,
+ &self.tcx.sess,
  sym::asm_experimental_arch,
  sp,
  "inline assembly is not stable yet on this architecture",
@@ -63,13 +63,8 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
  self.dcx().emit_err(AttSyntaxOnlyX86 { span: sp });
  }
  if asm.options.contains(InlineAsmOptions::MAY_UNWIND) && !self.tcx.features().asm_unwind {
- feature_err(
- &self.tcx.sess.parse_sess,
- sym::asm_unwind,
- sp,
- "the `may_unwind` option is unstable",
- )
- .emit();
+ feature_err(&self.tcx.sess, sym::asm_unwind, sp, "the `may_unwind` option is unstable")
+ .emit();
  }
 
  let mut clobber_abis = FxIndexMap::default();
@@ -183,7 +178,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
  InlineAsmOperand::Const { anon_const } => {
  if !self.tcx.features().asm_const {
  feature_err(
- &sess.parse_sess,
+ sess,
  sym::asm_const,
  *op_sp,
  "const operands for inline assembly are unstable",

compiler/rustc_ast_lowering/src/expr.rs

@@ -1512,7 +1512,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
  Some(hir::CoroutineKind::Coroutine(_)) => {
  if !self.tcx.features().coroutines {
  rustc_session::parse::feature_err(
- &self.tcx.sess.parse_sess,
+ &self.tcx.sess,
  sym::coroutines,
  span,
  "yield syntax is experimental",
@@ -1524,7 +1524,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
  None => {
  if !self.tcx.features().coroutines {
  rustc_session::parse::feature_err(
- &self.tcx.sess.parse_sess,
+ &self.tcx.sess,
  sym::coroutines,
  span,
  "yield syntax is experimental",

compiler/rustc_ast_lowering/src/lib.rs

@@ -1043,7 +1043,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
  {
  add_feature_diagnostics(
  &mut err,
- &self.tcx.sess.parse_sess,
+ &self.tcx.sess,
  sym::return_type_notation,
  );
  }
@@ -2310,7 +2310,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
  hir::ArrayLen::Infer(self.lower_node_id(c.id), self.lower_span(c.value.span))
  } else {
  feature_err(
- &self.tcx.sess.parse_sess,
+ &self.tcx.sess,
  sym::generic_arg_infer,
  c.value.span,
  "using `_` for array lengths is unstable",

compiler/rustc_ast_passes/src/feature_gate.rs

@@ -17,14 +17,12 @@ use crate::errors;
 macro_rules! gate {
  ($visitor:expr, $feature:ident, $span:expr, $explain:expr) => {{
  if !$visitor.features.$feature && !$span.allows_unstable(sym::$feature) {
- feature_err(&$visitor.sess.parse_sess, sym::$feature, $span, $explain).emit();
+ feature_err(&$visitor.sess, sym::$feature, $span, $explain).emit();
  }
  }};
  ($visitor:expr, $feature:ident, $span:expr, $explain:expr, $help:expr) => {{
  if !$visitor.features.$feature && !$span.allows_unstable(sym::$feature) {
- feature_err(&$visitor.sess.parse_sess, sym::$feature, $span, $explain)
- .with_help($help)
- .emit();
+ feature_err(&$visitor.sess, sym::$feature, $span, $explain).with_help($help).emit();
  }
  }};
 }
@@ -33,7 +31,7 @@ macro_rules! gate {
 macro_rules! gate_alt {
  ($visitor:expr, $has_feature:expr, $name:expr, $span:expr, $explain:expr) => {{
  if !$has_feature && !$span.allows_unstable($name) {
- feature_err(&$visitor.sess.parse_sess, $name, $span, $explain).emit();
+ feature_err(&$visitor.sess, $name, $span, $explain).emit();
  }
  }};
 }
@@ -45,7 +43,7 @@ macro_rules! gate_multi {
  let spans: Vec<_> =
  $spans.filter(|span| !span.allows_unstable(sym::$feature)).collect();
  if !spans.is_empty() {
- feature_err(&$visitor.sess.parse_sess, sym::$feature, spans, $explain).emit();
+ feature_err(&$visitor.sess, sym::$feature, spans, $explain).emit();
  }
  }
  }};
@@ -55,7 +53,7 @@ macro_rules! gate_multi {
 macro_rules! gate_legacy {
  ($visitor:expr, $feature:ident, $span:expr, $explain:expr) => {{
  if !$visitor.features.$feature && !$span.allows_unstable(sym::$feature) {
- feature_warn(&$visitor.sess.parse_sess, sym::$feature, $span, $explain);
+ feature_warn(&$visitor.sess, sym::$feature, $span, $explain);
  }
  }};
 }
@@ -91,14 +89,7 @@ impl<'a> PostExpansionVisitor<'a> {
  match abi::is_enabled(self.features, span, symbol_unescaped.as_str()) {
  Ok(()) => (),
  Err(abi::AbiDisabled::Unstable { feature, explain }) => {
- feature_err_issue(
- &self.sess.parse_sess,
- feature,
- span,
- GateIssue::Language,
- explain,
- )
- .emit();
+ feature_err_issue(&self.sess, feature, span, GateIssue::Language, explain).emit();
  }
  Err(abi::AbiDisabled::Unrecognized) => {
  if self.sess.opts.pretty.map_or(true, |ppm| ppm.needs_hir()) {
@@ -571,13 +562,8 @@ pub fn check_crate(krate: &ast::Crate, sess: &Session, features: &Features) {
  if let Ok(snippet) = sm.span_to_snippet(span)
  && snippet == "!"
  {
- feature_err(
- &sess.parse_sess,
- sym::never_patterns,
- span,
- "`!` patterns are experimental",
- )
- .emit();
+ feature_err(sess, sym::never_patterns, span, "`!` patterns are experimental")
+ .emit();
  } else {
  let suggestion = span.shrink_to_hi();
  sess.dcx().emit_err(errors::MatchArmWithNoBody { span, suggestion });

compiler/rustc_attr/src/builtin.rs

@@ -9,7 +9,7 @@ use rustc_macros::HashStable_Generic;
 use rustc_session::config::ExpectedValues;
 use rustc_session::lint::builtin::UNEXPECTED_CFGS;
 use rustc_session::lint::BuiltinLintDiagnostics;
-use rustc_session::parse::{feature_err, ParseSess};
+use rustc_session::parse::feature_err;
 use rustc_session::{RustcVersion, Session};
 use rustc_span::hygiene::Transparency;
 use rustc_span::{symbol::sym, symbol::Symbol, Span};
@@ -518,15 +518,15 @@ pub struct Condition {
 /// Tests if a cfg-pattern matches the cfg set
 pub fn cfg_matches(
  cfg: &ast::MetaItem,
- sess: &ParseSess,
+ sess: &Session,
  lint_node_id: NodeId,
  features: Option<&Features>,
 ) -> bool {
  eval_condition(cfg, sess, features, &mut |cfg| {
  try_gate_cfg(cfg.name, cfg.span, sess, features);
- match sess.check_config.expecteds.get(&cfg.name) {
+ match sess.parse_sess.check_config.expecteds.get(&cfg.name) {
  Some(ExpectedValues::Some(values)) if !values.contains(&cfg.value) => {
- sess.buffer_lint_with_diagnostic(
+ sess.parse_sess.buffer_lint_with_diagnostic(
  UNEXPECTED_CFGS,
  cfg.span,
  lint_node_id,
@@ -541,8 +541,8 @@ pub fn cfg_matches(
  ),
  );
  }
- None if sess.check_config.exhaustive_names => {
- sess.buffer_lint_with_diagnostic(
+ None if sess.parse_sess.check_config.exhaustive_names => {
+ sess.parse_sess.buffer_lint_with_diagnostic(
  UNEXPECTED_CFGS,
  cfg.span,
  lint_node_id,
@@ -555,18 +555,18 @@ pub fn cfg_matches(
  }
  _ => { /* not unexpected */ }
  }
- sess.config.contains(&(cfg.name, cfg.value))
+ sess.parse_sess.config.contains(&(cfg.name, cfg.value))
  })
 }
 
-fn try_gate_cfg(name: Symbol, span: Span, sess: &ParseSess, features: Option<&Features>) {
+fn try_gate_cfg(name: Symbol, span: Span, sess: &Session, features: Option<&Features>) {
  let gate = find_gated_cfg(|sym| sym == name);
  if let (Some(feats), Some(gated_cfg)) = (features, gate) {
  gate_cfg(gated_cfg, span, sess, feats);
  }
 }
 
-fn gate_cfg(gated_cfg: &GatedCfg, cfg_span: Span, sess: &ParseSess, features: &Features) {
+fn gate_cfg(gated_cfg: &GatedCfg, cfg_span: Span, sess: &Session, features: &Features) {
  let (cfg, feature, has_feature) = gated_cfg;
  if !has_feature(features) && !cfg_span.allows_unstable(*feature) {
  let explain = format!("`cfg({cfg})` is experimental and subject to change");
@@ -594,11 +594,11 @@ fn parse_version(s: Symbol) -> Option<RustcVersion> {
 /// evaluate individual items.
 pub fn eval_condition(
  cfg: &ast::MetaItem,
- sess: &ParseSess,
+ sess: &Session,
  features: Option<&Features>,
  eval: &mut impl FnMut(Condition) -> bool,
 ) -> bool {
- let dcx = &sess.dcx;
+ let dcx = &sess.parse_sess.dcx;
  match &cfg.kind {
  ast::MetaItemKind::List(mis) if cfg.name_or_empty() == sym::version => {
  try_gate_cfg(sym::version, cfg.span, sess, features);
@@ -626,7 +626,7 @@ pub fn eval_condition(
  };
 
  // See https://github.com/rust-lang/rust/issues/64796#issuecomment-640851454 for details
- if sess.assume_incomplete_release {
+ if sess.parse_sess.assume_incomplete_release {
  RustcVersion::CURRENT > min_version
  } else {
  RustcVersion::CURRENT >= min_version

compiler/rustc_builtin_macros/src/cfg.rs

@@ -22,7 +22,7 @@ pub fn expand_cfg(
  Ok(cfg) => {
  let matches_cfg = attr::cfg_matches(
  &cfg,
- &cx.sess.parse_sess,
+ &cx.sess,
  cx.current_expansion.lint_node_id,
  Some(cx.ecfg.features),
  );

compiler/rustc_builtin_macros/src/source_util.rs

@@ -107,7 +107,7 @@ pub fn expand_include<'cx>(
  return DummyResult::any(sp);
  };
  // The file will be added to the code map by the parser
- let file = match resolve_path(&cx.sess.parse_sess, file.as_str(), sp) {
+ let file = match resolve_path(&cx.sess, file.as_str(), sp) {
  Ok(f) => f,
  Err(err) => {
  err.emit();
@@ -179,7 +179,7 @@ pub fn expand_include_str(
  let Some(file) = get_single_str_from_tts(cx, sp, tts, "include_str!") else {
  return DummyResult::any(sp);
  };
- let file = match resolve_path(&cx.sess.parse_sess, file.as_str(), sp) {
+ let file = match resolve_path(&cx.sess, file.as_str(), sp) {
  Ok(f) => f,
  Err(err) => {
  err.emit();
@@ -213,7 +213,7 @@ pub fn expand_include_bytes(
  let Some(file) = get_single_str_from_tts(cx, sp, tts, "include_bytes!") else {
  return DummyResult::any(sp);
  };
- let file = match resolve_path(&cx.sess.parse_sess, file.as_str(), sp) {
+ let file = match resolve_path(&cx.sess, file.as_str(), sp) {
  Ok(f) => f,
  Err(err) => {
  err.emit();

compiler/rustc_codegen_ssa/src/back/link.rs

@@ -2860,7 +2860,7 @@ fn add_dynamic_crate(cmd: &mut dyn Linker, sess: &Session, cratepath: &Path) {
 
 fn relevant_lib(sess: &Session, lib: &NativeLib) -> bool {
  match lib.cfg {
- Some(ref cfg) => rustc_attr::cfg_matches(cfg, &sess.parse_sess, CRATE_NODE_ID, None),
+ Some(ref cfg) => rustc_attr::cfg_matches(cfg, sess, CRATE_NODE_ID, None),
  None => true,
  }
 }

compiler/rustc_codegen_ssa/src/codegen_attrs.rs

@@ -155,7 +155,7 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, did: LocalDefId) -> CodegenFnAttrs {
  Some([item]) if item.has_name(sym::linker) => {
  if !tcx.features().used_with_arg {
  feature_err(
- &tcx.sess.parse_sess,
+ &tcx.sess,
  sym::used_with_arg,
  attr.span,
  "`#[used(linker)]` is currently unstable",
@@ -167,7 +167,7 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, did: LocalDefId) -> CodegenFnAttrs {
  Some([item]) if item.has_name(sym::compiler) => {
  if !tcx.features().used_with_arg {
  feature_err(
- &tcx.sess.parse_sess,
+ &tcx.sess,
  sym::used_with_arg,
  attr.span,
  "`#[used(compiler)]` is currently unstable",
@@ -251,7 +251,7 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, did: LocalDefId) -> CodegenFnAttrs {
  && !attr.span.allows_unstable(sym::closure_track_caller)
  {
  feature_err(
- &tcx.sess.parse_sess,
+ &tcx.sess,
  sym::closure_track_caller,
  attr.span,
  "`#[track_caller]` on closures is currently unstable",
@@ -304,7 +304,7 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, did: LocalDefId) -> CodegenFnAttrs {
  // `#[target_feature]` on `main` and `start`.
  } else if !tcx.features().target_feature_11 {
  feature_err(
- &tcx.sess.parse_sess,
+ &tcx.sess,
  sym::target_feature_11,
  attr.span,
  "`#[target_feature(..)]` can only be applied to `unsafe` functions",

compiler/rustc_codegen_ssa/src/target_features.rs

@@ -82,7 +82,7 @@ pub fn from_target_feature(
  };
  if !allowed {
  feature_err(
- &tcx.sess.parse_sess,
+ &tcx.sess,
  feature_gate.unwrap(),
  item.span(),
  format!("the target feature `{feature}` is currently unstable"),