Auto merge of #13682 - Flowrey:fixes-13578, r=epage

Maintain sorting of dependency features

Fixes #13578

src/cargo/util/toml_mut/dependency.rs

@@ -4,12 +4,14 @@ use std::fmt::{Display, Formatter};
 use std::path::{Path, PathBuf};
 
 use indexmap::IndexSet;
+use itertools::Itertools;
 use toml_edit::KeyMut;
 
 use super::manifest::str_or_1_len_table;
 use crate::core::GitReference;
 use crate::core::SourceId;
 use crate::core::Summary;
+use crate::util::toml_mut::is_sorted;
 use crate::CargoResult;
 use crate::GlobalContext;
 
@@ -588,8 +590,13 @@ impl Dependency {
  .collect::<Option<IndexSet<_>>>()
  })
  .unwrap_or_default();
+ let is_already_sorted = is_sorted(features.iter());
  features.extend(new_features.iter().map(|s| s.as_str()));
- let features = features.into_iter().collect::<toml_edit::Value>();
+ let features = if is_already_sorted {
+ features.into_iter().sorted().collect::<toml_edit::Value>()
+ } else {
+ features.into_iter().collect::<toml_edit::Value>()
+ };
  table.set_dotted(false);
  overwrite_value(table, "features", features);
  } else {

tests/testsuite/cargo_add/mod.rs

@@ -111,7 +111,9 @@ mod path_inferred_name;
 mod path_inferred_name_conflicts_full_feature;
 mod path_normalized_name;
 mod preserve_dep_std_table;
+mod preserve_features_sorted;
 mod preserve_features_table;
+mod preserve_features_unsorted;
 mod preserve_sorted;
 mod preserve_unsorted;
 mod public;

tests/testsuite/cargo_add/overwrite_inline_features/out/Cargo.toml

@@ -8,5 +8,5 @@ edition = "2015"
 [dependencies]
 unrelateed-crate = "99999.0.0"
 # Before your-face
-your-face = { version = "99999.0.0", features = ["eyes", "nose", "mouth", "ears"] } # After your-face
+your-face = { version = "99999.0.0", features = ["ears", "eyes", "mouth", "nose"] } # After your-face
 # End

tests/testsuite/cargo_add/preserve_features_sorted/in/Cargo.toml

@@ -0,0 +1,9 @@
+[workspace]
+
+[package]
+name = "cargo-list-test-fixture"
+version = "0.0.0"
+edition = "2015"
+
+[dependencies]
+my-package = { version = "99999.0.0", features = ["a", "b", "c", "e"] }

tests/testsuite/cargo_add/preserve_features_sorted/mod.rs

@@ -0,0 +1,33 @@
+use cargo_test_support::compare::assert_ui;
+use cargo_test_support::current_dir;
+use cargo_test_support::file;
+use cargo_test_support::prelude::*;
+use cargo_test_support::str;
+use cargo_test_support::Project;
+
+#[cargo_test]
+fn case() {
+ cargo_test_support::registry::init();
+ cargo_test_support::registry::Package::new("my-package", "99999.0.0+my-package")
+ .feature("a", &[])
+ .feature("b", &[])
+ .feature("c", &[])
+ .feature("d", &[])
+ .feature("e", &[])
+ .publish();
+
+ let project = Project::from_template(current_dir!().join("in"));
+ let project_root = project.root();
+ let cwd = &project_root;
+
+ snapbox::cmd::Command::cargo_ui()
+ .arg("add")
+ .arg_line("my-package -F d")
+ .current_dir(cwd)
+ .assert()
+ .success()
+ .stdout_matches(str![""])
+ .stderr_matches(file!["stderr.term.svg"]);
+
+ assert_ui().subset_matches(current_dir!().join("out"), &project_root);
+}

tests/testsuite/cargo_add/preserve_features_sorted/out/Cargo.toml

@@ -0,0 +1,9 @@
+[workspace]
+
+[package]
+name = "cargo-list-test-fixture"
+version = "0.0.0"
+edition = "2015"
+
+[dependencies]
+my-package = { version = "99999.0.0", features = ["a", "b", "c", "d", "e"] }

tests/testsuite/cargo_add/preserve_features_unsorted/in/Cargo.toml

@@ -0,0 +1,9 @@
+[workspace]
+
+[package]
+name = "cargo-list-test-fixture"
+version = "0.0.0"
+edition = "2015"
+
+[dependencies]
+my-package = { version = "99999.0.0", features = ["b", "a", "d", "c"] }

tests/testsuite/cargo_add/preserve_features_unsorted/mod.rs

@@ -0,0 +1,33 @@
+use cargo_test_support::compare::assert_ui;
+use cargo_test_support::current_dir;
+use cargo_test_support::file;
+use cargo_test_support::prelude::*;
+use cargo_test_support::str;
+use cargo_test_support::Project;
+
+#[cargo_test]
+fn case() {
+ cargo_test_support::registry::init();
+ cargo_test_support::registry::Package::new("my-package", "99999.0.0+my-package")
+ .feature("a", &[])
+ .feature("b", &[])
+ .feature("c", &[])
+ .feature("d", &[])
+ .feature("e", &[])
+ .publish();
+
+ let project = Project::from_template(current_dir!().join("in"));
+ let project_root = project.root();
+ let cwd = &project_root;
+
+ snapbox::cmd::Command::cargo_ui()
+ .arg("add")
+ .arg_line("my-package -F e")
+ .current_dir(cwd)
+ .assert()
+ .success()
+ .stdout_matches(str![""])
+ .stderr_matches(file!["stderr.term.svg"]);
+
+ assert_ui().subset_matches(current_dir!().join("out"), &project_root);
+}

tests/testsuite/cargo_add/preserve_features_unsorted/out/Cargo.toml

@@ -0,0 +1,9 @@
+[workspace]
+
+[package]
+name = "cargo-list-test-fixture"
+version = "0.0.0"
+edition = "2015"
+
+[dependencies]
+my-package = { version = "99999.0.0", features = ["b", "a", "d", "c", "e"] }