diff options
| author | Michael Goulet <michael@errs.io> | 2023-01-04 16:49:38 +0000 |
|---|---|---|
| committer | Michael Goulet <michael@errs.io> | 2023-01-04 18:40:02 +0000 |
| commit | 8b0f43b19dcd97cc6b31c2d02b5526a48dd93c06 (patch) | |
| tree | 7b6ea8eda65159543b1774f44e0ec1e491e54c4f /compiler/rustc_session/src | |
| parent | 1e81f9a47fb801fab1c06ba40b06347ffebbd066 (diff) | |
| download | rust-8b0f43b19dcd97cc6b31c2d02b5526a48dd93c06.tar.gz rust-8b0f43b19dcd97cc6b31c2d02b5526a48dd93c06.zip | |
Rename stock solver to classic
Diffstat (limited to 'compiler/rustc_session/src')
| -rw-r--r-- | compiler/rustc_session/src/config.rs | 4 | ||||
| -rw-r--r-- | compiler/rustc_session/src/options.rs | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/compiler/rustc_session/src/config.rs b/compiler/rustc_session/src/config.rs index 4f1175856dc..a87e820386e 100644 --- a/compiler/rustc_session/src/config.rs +++ b/compiler/rustc_session/src/config.rs @@ -556,8 +556,8 @@ pub enum PrintRequest { #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] pub enum TraitSolver { - /// Stock trait solver in `rustc_trait_selection::traits::select` - Stock, + /// Classic trait solver in `rustc_trait_selection::traits::select` + Classic, /// Chalk trait solver Chalk, /// Experimental trait solver in `rustc_trait_selection::solve` diff --git a/compiler/rustc_session/src/options.rs b/compiler/rustc_session/src/options.rs index 9ce50246b08..043a60a1c53 100644 --- a/compiler/rustc_session/src/options.rs +++ b/compiler/rustc_session/src/options.rs @@ -383,7 +383,7 @@ mod desc { pub const parse_unpretty: &str = "`string` or `string=string`"; pub const parse_treat_err_as_bug: &str = "either no value or a number bigger than 0"; pub const parse_trait_solver: &str = - "one of the supported solver modes (`stock`, `chalk`, or `next`)"; + "one of the supported solver modes (`classic`, `chalk`, or `next`)"; pub const parse_lto: &str = "either a boolean (`yes`, `no`, `on`, `off`, etc), `thin`, `fat`, or omitted"; pub const parse_linker_plugin_lto: &str = @@ -884,9 +884,11 @@ mod parse { pub(crate) fn parse_trait_solver(slot: &mut TraitSolver, v: Option<&str>) -> bool { match v { - Some("stock") => *slot = TraitSolver::Stock, + Some("classic") => *slot = TraitSolver::Classic, Some("chalk") => *slot = TraitSolver::Chalk, Some("next") => *slot = TraitSolver::Next, + // default trait solver is subject to change.. + Some("default") => *slot = TraitSolver::Classic, _ => return false, } true @@ -1619,8 +1621,8 @@ options! { "for every macro invocation, print its name and arguments (default: no)"), track_diagnostics: bool = (false, parse_bool, [UNTRACKED], "tracks where in rustc a diagnostic was emitted"), - trait_solver: TraitSolver = (TraitSolver::Stock, parse_trait_solver, [TRACKED], - "specify the trait solver mode used by rustc (default: stock)"), + trait_solver: TraitSolver = (TraitSolver::Classic, parse_trait_solver, [TRACKED], + "specify the trait solver mode used by rustc (default: classic)"), // Diagnostics are considered side-effects of a query (see `QuerySideEffects`) and are saved // alongside query results and changes to translation options can affect diagnostics - so // translation options should be tracked. |