conflicts

Author: juleswritescode

crates/pglt_configuration/src/analyser/linter/rules.rs

@@ -153,27 +153,18 @@ pub struct Safety {
     #[doc = "Dropping a NOT NULL constraint may break existing clients."]
     #[serde(skip_serializing_if = "Option::is_none")]
     pub ban_drop_not_null: Option<RuleConfiguration<pglt_analyser::options::BanDropNotNull>>,
-<<<<<<< HEAD
-    #[doc = "Succinct description of the rule."]
-=======
     #[doc = "Dropping a table may break existing clients."]
->>>>>>> cbc49c8 (feat(rules): adding-required-field)
     #[serde(skip_serializing_if = "Option::is_none")]
     pub ban_drop_table: Option<RuleConfiguration<pglt_analyser::options::BanDropTable>>,
 }
 impl Safety {
     const GROUP_NAME: &'static str = "safety";
-<<<<<<< HEAD
-    pub(crate) const GROUP_RULES: &'static [&'static str] =
-        &["banDropColumn", "banDropNotNull", "banDropTable"];
-=======
     pub(crate) const GROUP_RULES: &'static [&'static str] = &[
         "addingRequiredField",
         "banDropColumn",
         "banDropNotNull",
         "banDropTable",
     ];
->>>>>>> cbc49c8 (feat(rules): adding-required-field)
     const RECOMMENDED_RULES: &'static [&'static str] = &["banDropColumn", "banDropNotNull"];
     const RECOMMENDED_RULES_AS_FILTERS: &'static [RuleFilter<'static>] = &[
         RuleFilter::Rule(Self::GROUP_NAME, Self::GROUP_RULES[1]),
@@ -183,10 +174,7 @@ impl Safety {
         RuleFilter::Rule(Self::GROUP_NAME, Self::GROUP_RULES[0]),
         RuleFilter::Rule(Self::GROUP_NAME, Self::GROUP_RULES[1]),
         RuleFilter::Rule(Self::GROUP_NAME, Self::GROUP_RULES[2]),
-<<<<<<< HEAD
-=======
         RuleFilter::Rule(Self::GROUP_NAME, Self::GROUP_RULES[3]),
->>>>>>> cbc49c8 (feat(rules): adding-required-field)
     ];
     #[doc = r" Retrieves the recommended rules"]
     pub(crate) fn is_recommended_true(&self) -> bool {
@@ -213,23 +201,16 @@ impl Safety {
                 index_set.insert(RuleFilter::Rule(Self::GROUP_NAME, Self::GROUP_RULES[1]));
             }
         }
-<<<<<<< HEAD
-        if let Some(rule) = self.ban_drop_table.as_ref() {
-=======
         if let Some(rule) = self.ban_drop_not_null.as_ref() {
->>>>>>> cbc49c8 (feat(rules): adding-required-field)
             if rule.is_enabled() {
                 index_set.insert(RuleFilter::Rule(Self::GROUP_NAME, Self::GROUP_RULES[2]));
             }
         }
-<<<<<<< HEAD
-=======
         if let Some(rule) = self.ban_drop_table.as_ref() {
             if rule.is_enabled() {
                 index_set.insert(RuleFilter::Rule(Self::GROUP_NAME, Self::GROUP_RULES[3]));
             }
         }
->>>>>>> cbc49c8 (feat(rules): adding-required-field)
         index_set
     }
     pub(crate) fn get_disabled_rules(&self) -> FxHashSet<RuleFilter<'static>> {
@@ -244,23 +225,16 @@ impl Safety {
                 index_set.insert(RuleFilter::Rule(Self::GROUP_NAME, Self::GROUP_RULES[1]));
             }
         }
-<<<<<<< HEAD
-        if let Some(rule) = self.ban_drop_table.as_ref() {
-=======
         if let Some(rule) = self.ban_drop_not_null.as_ref() {
->>>>>>> cbc49c8 (feat(rules): adding-required-field)
             if rule.is_disabled() {
                 index_set.insert(RuleFilter::Rule(Self::GROUP_NAME, Self::GROUP_RULES[2]));
             }
         }
-<<<<<<< HEAD
-=======
         if let Some(rule) = self.ban_drop_table.as_ref() {
             if rule.is_disabled() {
                 index_set.insert(RuleFilter::Rule(Self::GROUP_NAME, Self::GROUP_RULES[3]));
             }
         }
->>>>>>> cbc49c8 (feat(rules): adding-required-field)
         index_set
     }
     #[doc = r" Checks if, given a rule name, matches one of the rules contained in this category"]