diff --git a/src/analyses/compute_rules.rs b/src/analyses/compute_rules.rs index 458258c..c1b4d6c 100644 --- a/src/analyses/compute_rules.rs +++ b/src/analyses/compute_rules.rs @@ -237,14 +237,6 @@ impl PredicateStyle { show_scrut_access: true, }, ), - ( - "Stateless", - PredicateStyle::Sequent { - ty: TypeOfInterest::UserVisible, - show_reference_state: false, - show_scrut_access: false, - }, - ), ]; pub fn to_name(&self) -> Option<&str> { diff --git a/src/cli.rs b/src/cli.rs index 5a6c178..1ea821f 100644 --- a/src/cli.rs +++ b/src/cli.rs @@ -49,18 +49,10 @@ impl CliState { name: "Sequent", doc: "TODO", }, - OptionValue { - name: "BindingMode", - doc: "TODO", - }, OptionValue { name: "SequentBindingMode", doc: "TODO", }, - OptionValue { - name: "Stateless", - doc: "TODO", - }, ], doc: "the style of the typing predicate; not all rulesets can be expressed in all styles, \ only `Expression` is compatible with all rulesets", diff --git a/tests/snapshots/bundle_rules@stateless-Stateless.snap b/tests/snapshots/bundle_rules@stateless-Stateless.snap deleted file mode 100644 index 5ed9957..0000000 --- a/tests/snapshots/bundle_rules@stateless-Stateless.snap +++ /dev/null @@ -1,71 +0,0 @@ ---- -source: src/analyses/compute_rules.rs -info: - bundle_name: stateless - options: - match_constructor_through_ref: true - eat_inherited_ref_alone: true - inherited_ref_on_ref: EatOuter - fallback_to_outer: false - allow_ref_pat_on_ref_mut: true - simplify_deref_mut: true - downgrade_mut_inside_shared: false - eat_mut_inside_shared: true - ref_binding_on_inherited: AllocTemporary - mut_binding_on_inherited: Keep ---- -p0: T0, p1: T1 ------------------- "Constructor" -[p0, p1]: [T0, T1] - -p0: &T0, p1: &T1 -------------------- "ConstructorRef" -[p0, p1]: &[T0, T1] - -p0: &mut T0, p1: &mut T1 -------------------------- "ConstructorRef" -[p0, p1]: &mut [T0, T1] - -[p0, p1]: &T -------------- "ConstructorMultiRef" -[p0, p1]: &&T - -[p0, p1]: &T ------------------ "ConstructorMultiRef" -[p0, p1]: &&mut T - -[p0, p1]: &T ------------------ "ConstructorMultiRef" -[p0, p1]: &mut &T - -[p0, p1]: &mut T ---------------------- "ConstructorMultiRef" -[p0, p1]: &mut &mut T - -p: T ------- "Deref" -&p: &T - -p: T --------------- "Deref" -&mut p: &mut T - -p: T ----------- "DerefMutWithShared" -&p: &mut T - -x: &T --------- "BindingBorrow" -ref x: T - -x: &mut T ------------- "BindingBorrow" -ref mut x: T - - ----- "Binding" -x: T - - --------- "Binding" -mut x: T diff --git a/tests/snapshots/trace_cli@11515459865669657874.snap b/tests/snapshots/trace_cli@11515459865669657874.snap index 86076c8..91410fe 100644 --- a/tests/snapshots/trace_cli@11515459865669657874.snap +++ b/tests/snapshots/trace_cli@11515459865669657874.snap @@ -25,7 +25,7 @@ Options are: How to handle a `mut x` binding on an inherited reference - simplify_deref_mut: false | true Whether to simplify `*&mut expr`, which removes some borrow errors -- predicate_style: Expression | Sequent | BindingMode | SequentBindingMode | Stateless +- predicate_style: Expression | Sequent | SequentBindingMode the style of the typing predicate; not all rulesets can be expressed in all styles, only `Expression` is compatible with all rulesets There also exist some predefined option-bundles. Activate one with `set ` diff --git a/tests/snapshots/trace_cli@16736406663811832092.snap b/tests/snapshots/trace_cli@16736406663811832092.snap index bc6f7f9..521cc7a 100644 --- a/tests/snapshots/trace_cli@16736406663811832092.snap +++ b/tests/snapshots/trace_cli@16736406663811832092.snap @@ -25,7 +25,7 @@ Options are: How to handle a `mut x` binding on an inherited reference - simplify_deref_mut: false | true Whether to simplify `*&mut expr`, which removes some borrow errors -- predicate_style: Expression | Sequent | BindingMode | SequentBindingMode | Stateless +- predicate_style: Expression | Sequent | SequentBindingMode the style of the typing predicate; not all rulesets can be expressed in all styles, only `Expression` is compatible with all rulesets There also exist some predefined option-bundles. Activate one with `set ` diff --git a/tests/snapshots/trace_cli@17515479014605656910.snap b/tests/snapshots/trace_cli@17515479014605656910.snap index d3b7d4e..c216c29 100644 --- a/tests/snapshots/trace_cli@17515479014605656910.snap +++ b/tests/snapshots/trace_cli@17515479014605656910.snap @@ -25,7 +25,7 @@ Options are: How to handle a `mut x` binding on an inherited reference - simplify_deref_mut: false | true Whether to simplify `*&mut expr`, which removes some borrow errors -- predicate_style: Expression | Sequent | BindingMode | SequentBindingMode | Stateless +- predicate_style: Expression | Sequent | SequentBindingMode the style of the typing predicate; not all rulesets can be expressed in all styles, only `Expression` is compatible with all rulesets There also exist some predefined option-bundles. Activate one with `set ` diff --git a/tests/snapshots/trace_cli@3615762548608754050.snap b/tests/snapshots/trace_cli@3615762548608754050.snap index db99f37..820a2d2 100644 --- a/tests/snapshots/trace_cli@3615762548608754050.snap +++ b/tests/snapshots/trace_cli@3615762548608754050.snap @@ -26,7 +26,7 @@ Options are: How to handle a `mut x` binding on an inherited reference - simplify_deref_mut: false | true Whether to simplify `*&mut expr`, which removes some borrow errors -- predicate_style: Expression | Sequent | BindingMode | SequentBindingMode | Stateless +- predicate_style: Expression | Sequent | SequentBindingMode the style of the typing predicate; not all rulesets can be expressed in all styles, only `Expression` is compatible with all rulesets There also exist some predefined option-bundles. Activate one with `set ` diff --git a/tests/snapshots/trace_cli@6722020181128628927.snap b/tests/snapshots/trace_cli@6722020181128628927.snap deleted file mode 100644 index 207b7f7..0000000 --- a/tests/snapshots/trace_cli@6722020181128628927.snap +++ /dev/null @@ -1,5 +0,0 @@ ---- -source: tests/trace_cli.rs -info: set predicate_style Stateless ---- -Error: the current ruleset cannot be displayed with style Stateless. diff --git a/tests/trace_cli.rs b/tests/trace_cli.rs index 867271b..8f57ee3 100644 --- a/tests/trace_cli.rs +++ b/tests/trace_cli.rs @@ -23,7 +23,6 @@ fn trace_cli() -> anyhow::Result<()> { "set rfc3627\nset predicate_style SequentBindingMode\nrules", "save\nset downgrade_mut_inside_shared true\nswap\ncompare", "save\nset structural\nswap\nrules", - "set predicate_style Stateless", "set stable_rust\n[&x]: &[AT]", "&ap: &T", "set predicate_style SequentBindingMode",