refactor(gctx): mergable -> mergeable

Author: weihanglo

src/cargo/util/context/mod.rs

@@ -1021,7 +1021,7 @@ impl GlobalContext {
             return Ok(());
         };
 
-        if is_nonmergable_list(&key) {
+        if is_nonmergeable_list(&key) {
             output.clear();
         }
 
@@ -2208,7 +2208,7 @@ impl ConfigValue {
         let is_higher_priority = from.definition().is_higher_priority(self.definition());
         match (self, from) {
             (&mut CV::List(ref mut old, _), CV::List(ref mut new, _)) => {
-                if is_nonmergable_list(&parts) {
+                if is_nonmergeable_list(&parts) {
                     // Use whichever list is higher priority.
                     if force || is_higher_priority {
                         mem::swap(new, old);
@@ -2358,7 +2358,7 @@ impl ConfigValue {
 
 /// List of which configuration lists cannot be merged.
 /// Instead of merging, these the higher priority list replaces the lower priority list.
-fn is_nonmergable_list(key: &ConfigKey) -> bool {
+fn is_nonmergeable_list(key: &ConfigKey) -> bool {
     key.matches("registry.credential-provider")
         || key.matches("registries.*.credential-provider")
         || key.matches("target.*.runner")

src/cargo/util/context/path.rs

@@ -98,7 +98,7 @@ impl ConfigRelativePath {
 /// to get the actual program.
 ///
 /// **Note**: Any usage of this type in config needs to be listed in
-/// the `util::context::is_nonmergable_list` check to prevent list merging
+/// the `util::context::is_nonmergeable_list` check to prevent list merging
 /// from multiple config files.
 #[derive(Debug, Clone, PartialEq)]
 pub struct PathAndArgs {

tests/testsuite/config.rs

@@ -2181,7 +2181,7 @@ gitoxide = \"fetch\"
 }
 
 #[cargo_test]
-fn nonmergable_lists() {
+fn nonmergeable_lists() {
     let root_path = paths::root().join(".cargo/config.toml");
     write_config_at(
         &root_path,