itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-09-28 11:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Display only feature list or summarized on cargo add

Browse Source
This commit is contained in:
Angelo Ross 2023-09-19 10:20:36 -03:00
parent c25bee16c9
commit 72dccecb19
No known key found for this signature in database
GPG Key ID: 87B29327F215C4C7
16 changed files with 44 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/cargo/ops/cargo_add/mod.rs
View File

@ -943,56 +943,49 @@ fn print_dep_table_msg(shell: &mut Shell, dep: &DependencyUI) -> CargoResult<()>
if matches!(shell.verbosity(), crate::core::shell::Verbosity::Quiet) {
return Ok(());
}
let (activated, deactivated) = dep.features();
if !activated.is_empty() || !deactivated.is_empty() {
let prefix = format!("{:>13}", " ");
let suffix = format_feature_version_suffix(&dep);
let suffix = format_features_version_suffix(&dep);
shell.write_stderr(format_args!("{}Features{}:\n", prefix, suffix), &style::NOP)?;
shell.write_stderr(format_args!("{prefix}Features{suffix}:\n"), &style::NOP)?;
const MAX_FEATURE_PRINTS: usize = 50;
let mut activated_printed = 0;
const MAX_FEATURE_PRINTS: usize = 30;
let total_activated = activated.len();
for feat in activated {
if activated_printed >= MAX_FEATURE_PRINTS {
let remaining = total_activated - activated_printed;
shell.write_stderr(
format_args!("{prefix}... {remaining} more activated features\n"),
&style::NOP,
)?;
break;
}
let total_deactivated = deactivated.len();
shell.write_stderr(&prefix, &style::NOP)?;
shell.write_stderr('+', &style::GOOD)?;
shell.write_stderr(format_args!(" {}\n", feat), &style::NOP)?;
activated_printed += 1;
if total_activated <= MAX_FEATURE_PRINTS {
for feat in activated {
shell.write_stderr(&prefix, &style::NOP)?;
shell.write_stderr('+', &style::GOOD)?;
shell.write_stderr(format_args!(" {feat}\n"), &style::NOP)?;
}
} else {
shell.write_stderr(
format_args!("{prefix}{total_activated} activated features\n"),
&style::NOP,
)?;
}
let mut deactivated_printed = 0;
let total_deactivated = deactivated.len();
for feat in deactivated {
if activated_printed + deactivated_printed >= MAX_FEATURE_PRINTS {
let remaining = total_deactivated - deactivated_printed;
shell.write_stderr(
format_args!("{prefix}... {remaining} more deactivated features\n"),
&style::NOP,
)?;
break;
if total_activated + total_deactivated <= MAX_FEATURE_PRINTS {
for feat in deactivated {
shell.write_stderr(&prefix, &style::NOP)?;
shell.write_stderr('-', &style::ERROR)?;
shell.write_stderr(format_args!(" {feat}\n"), &style::NOP)?;
}
shell.write_stderr(&prefix, &style::NOP)?;
shell.write_stderr('-', &style::ERROR)?;
shell.write_stderr(format_args!(" {}\n", feat), &style::NOP)?;
deactivated_printed += 1;
} else {
shell.write_stderr(
format_args!("{prefix}{total_deactivated} deactivated features\n"),
&style::NOP,
)?;
}
}
Ok(())
}
fn format_feature_version_suffix(dep: &DependencyUI) -> String {
fn format_features_version_suffix(dep: &DependencyUI) -> String {
if let Some(version) = &dep.available_version {
let mut version = version.clone();
version.build = Default::default();

0
tests/testsuite/cargo_add/features_too_many_activated/in/Cargo.toml → tests/testsuite/cargo_add/features_activated_over_limit/in/Cargo.toml
View File

0
tests/testsuite/cargo_add/features_too_many_activated/in/src/lib.rs → tests/testsuite/cargo_add/features_activated_over_limit/in/src/lib.rs
View File

0
tests/testsuite/cargo_add/features_too_many_activated/mod.rs → tests/testsuite/cargo_add/features_activated_over_limit/mod.rs
View File

0
tests/testsuite/cargo_add/features_too_many_activated/out/Cargo.toml → tests/testsuite/cargo_add/features_activated_over_limit/out/Cargo.toml
View File

5
tests/testsuite/cargo_add/features_activated_over_limit/stderr.log Normal file
View File

@ -0,0 +1,5 @@
Updating `dummy-registry` index
Adding your-face v99999.0.0 to dependencies.
Features:
100 activated features
100 deactivated features

0
tests/testsuite/cargo_add/features_too_many_activated/stdout.log → tests/testsuite/cargo_add/features_activated_over_limit/stdout.log
View File

0
tests/testsuite/cargo_add/features_too_many_few_activated/in/Cargo.toml → tests/testsuite/cargo_add/features_deactivated_over_limit/in/Cargo.toml
View File

0
tests/testsuite/cargo_add/features_too_many_few_activated/in/src/lib.rs → tests/testsuite/cargo_add/features_deactivated_over_limit/in/src/lib.rs
View File

2
tests/testsuite/cargo_add/features_too_many_few_activated/mod.rs → tests/testsuite/cargo_add/features_deactivated_over_limit/mod.rs
View File

@ -8,7 +8,7 @@ use cargo_test_support::curr_dir;
#[cargo_test]
fn case() {
const MANY_FEATURES_COUNT: usize = 200;
const ACTIVATED_FEATURES_COUNT: usize = 10;
const ACTIVATED_FEATURES_COUNT: usize = 30;
cargo_test_support::registry::init();
let mut test_package =

8
tests/testsuite/cargo_add/features_deactivated_over_limit/out/Cargo.toml Normal file
View File

@ -0,0 +1,8 @@
[workspace]
[package]
name = "cargo-list-test-fixture"
version = "0.0.0"
[dependencies]
your-face = { version = "99999.0.0", features = ["eyes000", "eyes001", "eyes002", "eyes003", "eyes004", "eyes005", "eyes006", "eyes007", "eyes008", "eyes009", "eyes010", "eyes011", "eyes012", "eyes013", "eyes014", "eyes015", "eyes016", "eyes017", "eyes018", "eyes019", "eyes020", "eyes021", "eyes022", "eyes023", "eyes024", "eyes025", "eyes026", "eyes027", "eyes028", "eyes029"] }

23
tests/testsuite/cargo_add/features_too_many_activated/stderr.log → tests/testsuite/cargo_add/features_deactivated_over_limit/stderr.log
View File

@ -31,25 +31,4 @@
+ eyes027
+ eyes028
+ eyes029
+ eyes030
+ eyes031
+ eyes032
+ eyes033
+ eyes034
+ eyes035
+ eyes036
+ eyes037
+ eyes038
+ eyes039
+ eyes040
+ eyes041
+ eyes042
+ eyes043
+ eyes044
+ eyes045
+ eyes046
+ eyes047
+ eyes048
+ eyes049
... 50 more activated features
... 100 more deactivated features
170 deactivated features

0
tests/testsuite/cargo_add/features_too_many_few_activated/stdout.log → tests/testsuite/cargo_add/features_deactivated_over_limit/stdout.log
View File

8
tests/testsuite/cargo_add/features_too_many_few_activated/out/Cargo.toml
View File

@ -1,8 +0,0 @@
[workspace]
[package]
name = "cargo-list-test-fixture"
version = "0.0.0"
[dependencies]
your-face = { version = "99999.0.0", features = ["eyes000", "eyes001", "eyes002", "eyes003", "eyes004", "eyes005", "eyes006", "eyes007", "eyes008", "eyes009"] }

54
tests/testsuite/cargo_add/features_too_many_few_activated/stderr.log
View File

@ -1,54 +0,0 @@
Updating `dummy-registry` index
Adding your-face v99999.0.0 to dependencies.
Features:
+ eyes000
+ eyes001
+ eyes002
+ eyes003
+ eyes004
+ eyes005
+ eyes006
+ eyes007
+ eyes008
+ eyes009
- eyes010
- eyes011
- eyes012
- eyes013
- eyes014
- eyes015
- eyes016
- eyes017
- eyes018
- eyes019
- eyes020
- eyes021
- eyes022
- eyes023
- eyes024
- eyes025
- eyes026
- eyes027
- eyes028
- eyes029
- eyes030
- eyes031
- eyes032
- eyes033
- eyes034
- eyes035
- eyes036
- eyes037
- eyes038
- eyes039
- eyes040
- eyes041
- eyes042
- eyes043
- eyes044
- eyes045
- eyes046
- eyes047
- eyes048
- eyes049
... 150 more deactivated features

4
tests/testsuite/cargo_add/mod.rs
View File

@ -18,12 +18,12 @@ mod dev_prefer_existing_version;
mod dry_run;
mod empty_dep_table;
mod features;
mod features_activated_over_limit;
mod features_deactivated_over_limit;
mod features_empty;
mod features_multiple_occurrences;
mod features_preserve;
mod features_spaced_values;
mod features_too_many_activated;
mod features_too_many_few_activated;
mod features_unknown;
mod features_unknown_no_features;
mod git;