Commit 74fd79b

compiler-errorslcnr

authored and

committed

1 parent c8c98c8 commit 74fd79bCopy full SHA for 74fd79b

File tree

+10

-6

lines changed

compiler
- rustc_ast_passes/src
  - feature_gate.rs
- rustc_middle/src/ty
  - context.rs

+10

-6

lines changed

Lines changed: 9 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`use rustc_ast as ast;`
`2`	`2`	`use rustc_ast::visit::{self, AssocCtxt, FnCtxt, FnKind, Visitor};`
`3`	`3`	`use rustc_ast::{NodeId, PatKind, attr, token};`
	`4`	`+use rustc_errors::E0001;`
`4`	`5`	`use rustc_feature::{AttributeGate, BUILTIN_ATTRIBUTE_MAP, BuiltinAttribute, Features};`
`5`	`6`	`use rustc_session::Session;`
`6`	`7`	`use rustc_session::parse::{feature_err, feature_warn};`
`@@ -648,10 +649,13 @@ fn check_new_solver_banned_features(sess: &Session, features: &Features) {`
`648`	`649`	`.map(\|feat\| feat.attr_sp)`
`649`	`650`	`{`
`650`	`651`	`#[allow(rustc::symbol_intern_string_literal)]`
`651`		`- sess.dcx().emit_err(errors::IncompatibleFeatures {`
`652`		`- spans: vec![gce_span],`
`653`		`- f1: Symbol::intern("-Znext-solver=globally"),`
`654`		`- f2: sym::generic_const_exprs,`
`655`		`- });`
	`652`	`+ sess.dcx()`
	`653`	`+ .create_fatal(errors::IncompatibleFeatures {`
	`654`	`+ spans: vec![gce_span],`
	`655`	`+ f1: Symbol::intern("-Znext-solver=globally"),`
	`656`	`+ f2: sym::generic_const_exprs,`
	`657`	`+ })`
	`658`	`+ .with_code(E0001)`
	`659`	`+ .emit();`
`656`	`660`	`}`
`657`	`661`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3337,7 +3337,7 @@ impl<'tcx> TyCtxt<'tcx> {`
`3337`	`3337`	`}`
`3338`	`3338`
`3339`	`3339`	`pub fn next_trait_solver_globally(self) -> bool {`
`3340`		`- self.sess.opts.unstable_opts.next_solver.globally`
	`3340`	`+ self.sess.opts.unstable_opts.next_solver.globally && !self.features().generic_const_exprs()`
`3341`	`3341`	`}`
`3342`	`3342`
`3343`	`3343`	`pub fn next_trait_solver_in_coherence(self) -> bool {`

Comments

(0)