Rename "nadri" ruleset

Nadrieril · Nadrieril · commit 0621ce06e6f1 · 2025-01-26T17:39:00.000+01:00
diff --git a/src/analyses/compare.rs b/src/analyses/compare.rs
@@ -273,13 +273,13 @@ fn compare() {
     let a = &Arenas::default();
     let compare: &[(&str, RuleSet, TestSettings, RuleSet)] = &[
         (
-            "nadri",
+            "stateless_no_temporaries",
             TypeBased(RuleOptions {
                 // `ergo-formality` doesn't support the `Keep` option.
                 mut_binding_on_inherited: MutBindingOnInheritedBehavior::Error,
                 // `ergo-formality` doesn't support any option.
                 ref_binding_on_inherited: RefBindingOnInheritedBehavior::ResetBindingMode,
-                ..RuleOptions::NADRI
+                ..RuleOptions::STATELESS_NO_TEMPORARIES
             }),
             Somewhat.expect(Equal).shallower(),
             BindingModeBased({
diff --git a/src/cli.rs b/src/cli.rs
@@ -60,7 +60,7 @@ impl CliState {
     pub fn new() -> Self {
         Self {
             history: Vec::new(),
-            options: RuleOptions::NADRI,
+            options: RuleOptions::STATELESS_NO_TEMPORARIES,
             predicate_style: PredicateStyle::from_name("SequentUserVisible").unwrap(),
             saved: None,
         }
diff --git a/src/rulesets/ty_based.rs b/src/rulesets/ty_based.rs
@@ -426,7 +426,7 @@ impl RuleOptions {
     };
 
     /// The default setting for the solver. A reasonable proposal.
-    pub const NADRI: Self = RuleOptions {
+    pub const STATELESS_NO_TEMPORARIES: Self = RuleOptions {
         ref_binding_on_inherited: RefBindingOnInheritedBehavior::Error,
         ..Self::STATELESS
     };
@@ -515,8 +515,8 @@ pub static KNOWN_TY_BASED_BUNDLES: &[BundleDoc<RuleOptions>] = &[
         doc: "A proposal that tracks no hidden state; purely type-based",
     },
     BundleDoc {
-        name: "nadri",
-        ruleset: RuleOptions::NADRI,
+        name: "stateless_no_temporaries",
+        ruleset: RuleOptions::STATELESS_NO_TEMPORARIES,
         doc: "A reasonable proposal; like `stateless` but \
                 forbids `ref` bindings that create temporaries",
     },
diff --git a/tests/generate_design_doc.rs b/tests/generate_design_doc.rs
@@ -5,7 +5,7 @@ use typing_rust_patterns::*;
 #[test]
 fn generate_design_doc() -> anyhow::Result<()> {
     colored::control::set_override(false);
-    let options = RuleOptions::NADRI;
+    let options = RuleOptions::STATELESS_NO_TEMPORARIES;
 
     let examples = [
         ("[&x]: &[&T]", "`x: &T`"),
diff --git a/tests/snapshots/bundle_rules@stateless_no_temporaries-Let.snap b/tests/snapshots/bundle_rules@stateless_no_temporaries-Let.snap
@@ -1,7 +1,7 @@
 ---
 source: src/analyses/compute_rules.rs
 info:
-  bundle_name: nadri
+  bundle_name: stateless_no_temporaries
   options:
     match_constructor_through_ref: true
     eat_inherited_ref_alone: true
diff --git a/tests/snapshots/bundle_rules@stateless_no_temporaries-SequentInMemory.snap b/tests/snapshots/bundle_rules@stateless_no_temporaries-SequentInMemory.snap
@@ -1,7 +1,7 @@
 ---
 source: src/analyses/compute_rules.rs
 info:
-  bundle_name: nadri
+  bundle_name: stateless_no_temporaries
   options:
     match_constructor_through_ref: true
     eat_inherited_ref_alone: true
diff --git a/tests/snapshots/bundle_rules@stateless_no_temporaries-SequentUserVisible.snap b/tests/snapshots/bundle_rules@stateless_no_temporaries-SequentUserVisible.snap
@@ -1,7 +1,7 @@
 ---
 source: src/analyses/compute_rules.rs
 info:
-  bundle_name: nadri
+  bundle_name: stateless_no_temporaries
   options:
     match_constructor_through_ref: true
     eat_inherited_ref_alone: true
diff --git a/tests/snapshots/compare@stateless_no_temporaries.snap b/tests/snapshots/compare@stateless_no_temporaries.snap
@@ -1,6 +1,6 @@
 ---
 source: src/analyses/compare.rs
-info: nadri
+info: stateless_no_temporaries
 ---
 Difference on `[&x]: &mut [&CT]`:
    left returned: Success(x: &CT)
diff --git a/tests/snapshots/trace_cli@11515459865669657874.snap b/tests/snapshots/trace_cli@11515459865669657874.snap
@@ -31,7 +31,7 @@ Options are:
 There also exist some predefined option-bundles. Activate one with `set <bundle>`
 - stable_rust: The behavior of current stable rust
 - stateless: A proposal that tracks no hidden state; purely type-based
-- nadri: A reasonable proposal; like `stateless` but forbids `ref` bindings that create temporaries
+- stateless_no_temporaries: A reasonable proposal; like `stateless` but forbids `ref` bindings that create temporaries
 - stateless_2021: The currently-planned version of the `stateless` ruleset for edition 2021. Not actually stateless.
 - eat_outer_2021: A backwards-compatible proposal by @dianne that behaves close to the 2024 stateless proposal.
 - rfc3627: The accepted RFC3627 behavior
diff --git a/tests/snapshots/trace_cli@16736406663811832092.snap b/tests/snapshots/trace_cli@16736406663811832092.snap
@@ -31,7 +31,7 @@ Options are:
 There also exist some predefined option-bundles. Activate one with `set <bundle>`
 - stable_rust: The behavior of current stable rust
 - stateless: A proposal that tracks no hidden state; purely type-based
-- nadri: A reasonable proposal; like `stateless` but forbids `ref` bindings that create temporaries
+- stateless_no_temporaries: A reasonable proposal; like `stateless` but forbids `ref` bindings that create temporaries
 - stateless_2021: The currently-planned version of the `stateless` ruleset for edition 2021. Not actually stateless.
 - eat_outer_2021: A backwards-compatible proposal by @dianne that behaves close to the 2024 stateless proposal.
 - rfc3627: The accepted RFC3627 behavior
diff --git a/tests/snapshots/trace_cli@17515479014605656910.snap b/tests/snapshots/trace_cli@17515479014605656910.snap
@@ -31,7 +31,7 @@ Options are:
 There also exist some predefined option-bundles. Activate one with `set <bundle>`
 - stable_rust: The behavior of current stable rust
 - stateless: A proposal that tracks no hidden state; purely type-based
-- nadri: A reasonable proposal; like `stateless` but forbids `ref` bindings that create temporaries
+- stateless_no_temporaries: A reasonable proposal; like `stateless` but forbids `ref` bindings that create temporaries
 - stateless_2021: The currently-planned version of the `stateless` ruleset for edition 2021. Not actually stateless.
 - eat_outer_2021: A backwards-compatible proposal by @dianne that behaves close to the 2024 stateless proposal.
 - rfc3627: The accepted RFC3627 behavior
diff --git a/tests/snapshots/trace_cli@3615762548608754050.snap b/tests/snapshots/trace_cli@3615762548608754050.snap
@@ -32,7 +32,7 @@ Options are:
 There also exist some predefined option-bundles. Activate one with `set <bundle>`
 - stable_rust: The behavior of current stable rust
 - stateless: A proposal that tracks no hidden state; purely type-based
-- nadri: A reasonable proposal; like `stateless` but forbids `ref` bindings that create temporaries
+- stateless_no_temporaries: A reasonable proposal; like `stateless` but forbids `ref` bindings that create temporaries
 - stateless_2021: The currently-planned version of the `stateless` ruleset for edition 2021. Not actually stateless.
 - eat_outer_2021: A backwards-compatible proposal by @dianne that behaves close to the 2024 stateless proposal.
 - rfc3627: The accepted RFC3627 behavior
diff --git a/web/src/components/Solver.jsx b/web/src/components/Solver.jsx
@@ -410,7 +410,7 @@ export default function Solver() {
     const [searchParams, setSearchParams] = useSearchParams();
     const sp = {searchParams, setSearchParams};
     const [compare, setCompare] = useStateInParams(sp, 'compare', false, (x) => x == 'true');
-    const [optionsLeft, setOptionsLeft] = useStateInParams(sp, 'opts1', RuleSetJs.from_bundle_name('nadri', 'stable'), RuleSetJs.decode, (o) => o.encode());
+    const [optionsLeft, setOptionsLeft] = useStateInParams(sp, 'opts1', RuleSetJs.from_bundle_name('stateless_no_temporaries', 'stable'), RuleSetJs.decode, (o) => o.encode());
     const [optionsRight, setOptionsRight] = useStateInParams(sp, 'opts2', RuleSetJs.from_bundle_name('rfc3627', 'rfc3627'), RuleSetJs.decode, (o) => o.encode());
     const [inputQuery, setInputQuery] = useStateInParams(sp, 'q', "[&x]: &mut [&T]");
     const [mode, setMode] = useStateInParams(sp, 'mode', 'typechecker', validateIn(['typechecker', 'rules', 'compare']));

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ impl CliState {`
`60`	`60`	`pub fn new() -> Self {`
`61`	`61`	`Self {`
`62`	`62`	`history: Vec::new(),`
`63`		`- options: RuleOptions::NADRI,`
	`63`	`+ options: RuleOptions::STATELESS_NO_TEMPORARIES,`
`64`	`64`	`predicate_style: PredicateStyle::from_name("SequentUserVisible").unwrap(),`
`65`	`65`	`saved: None,`
`66`	`66`	`}`