mirror of
https://github.com/rust-lang/cargo.git
synced 2025-09-28 11:20:36 +00:00
fix(add): Focus on error, rather than large feature lists
Inspired by #11100 and previous work to collapse feature lists down.
This commit is contained in:
Ed Page
parent
4a0b8948dd
commit
524d123332
@ -168,36 +168,44 @@ pub fn add(workspace: &Workspace<'_>, options: &AddOptions<'_>) -> CargoResult<(
|
||||
write!(message, "no features available for crate {}", dep.name)?;
|
||||
} else {
|
||||
if !deactivated.is_empty() {
|
||||
writeln!(
|
||||
message,
|
||||
"disabled features:\n {}",
|
||||
deactivated
|
||||
.iter()
|
||||
.map(|s| s.to_string())
|
||||
.coalesce(|x, y| if x.len() + y.len() < 78 {
|
||||
Ok(format!("{x}, {y}"))
|
||||
} else {
|
||||
Err((x, y))
|
||||
})
|
||||
.into_iter()
|
||||
.format("\n ")
|
||||
)?
|
||||
if deactivated.len() <= MAX_FEATURE_PRINTS {
|
||||
writeln!(
|
||||
message,
|
||||
"disabled features:\n {}",
|
||||
deactivated
|
||||
.iter()
|
||||
.map(|s| s.to_string())
|
||||
.coalesce(|x, y| if x.len() + y.len() < 78 {
|
||||
Ok(format!("{x}, {y}"))
|
||||
} else {
|
||||
Err((x, y))
|
||||
})
|
||||
.into_iter()
|
||||
.format("\n ")
|
||||
)?;
|
||||
} else {
|
||||
writeln!(message, "{} disabled features available", deactivated.len())?;
|
||||
}
|
||||
}
|
||||
if !activated.is_empty() {
|
||||
writeln!(
|
||||
message,
|
||||
"enabled features:\n {}",
|
||||
activated
|
||||
.iter()
|
||||
.map(|s| s.to_string())
|
||||
.coalesce(|x, y| if x.len() + y.len() < 78 {
|
||||
Ok(format!("{x}, {y}"))
|
||||
} else {
|
||||
Err((x, y))
|
||||
})
|
||||
.into_iter()
|
||||
.format("\n ")
|
||||
)?
|
||||
if deactivated.len() + activated.len() <= MAX_FEATURE_PRINTS {
|
||||
writeln!(
|
||||
message,
|
||||
"enabled features:\n {}",
|
||||
activated
|
||||
.iter()
|
||||
.map(|s| s.to_string())
|
||||
.coalesce(|x, y| if x.len() + y.len() < 78 {
|
||||
Ok(format!("{x}, {y}"))
|
||||
} else {
|
||||
Err((x, y))
|
||||
})
|
||||
.into_iter()
|
||||
.format("\n ")
|
||||
)?;
|
||||
} else {
|
||||
writeln!(message, "{} enabled features available", activated.len())?;
|
||||
}
|
||||
}
|
||||
}
|
||||
anyhow::bail!(message.trim().to_owned());
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<svg width="740px" height="254px" xmlns="http://www.w3.org/2000/svg">
|
||||
<svg width="740px" height="164px" xmlns="http://www.w3.org/2000/svg">
|
||||
<style>
|
||||
.fg { fill: #AAAAAA }
|
||||
.bg { background: #000000 }
|
||||
@ -31,19 +31,9 @@
|
||||
</tspan>
|
||||
<tspan x="10px" y="118px"><tspan> eyes049</tspan>
|
||||
</tspan>
|
||||
<tspan x="10px" y="136px"><tspan>enabled features:</tspan>
|
||||
<tspan x="10px" y="136px"><tspan>40 enabled features available</tspan>
|
||||
</tspan>
|
||||
<tspan x="10px" y="154px"><tspan> eyes000, eyes001, eyes002, eyes003, eyes004, eyes005, eyes006, eyes007, eyes008</tspan>
|
||||
</tspan>
|
||||
<tspan x="10px" y="172px"><tspan> eyes009, eyes010, eyes011, eyes012, eyes013, eyes014, eyes015, eyes016, eyes017</tspan>
|
||||
</tspan>
|
||||
<tspan x="10px" y="190px"><tspan> eyes018, eyes019, eyes020, eyes021, eyes022, eyes023, eyes024, eyes025, eyes026</tspan>
|
||||
</tspan>
|
||||
<tspan x="10px" y="208px"><tspan> eyes027, eyes028, eyes029, eyes030, eyes031, eyes032, eyes033, eyes034, eyes035</tspan>
|
||||
</tspan>
|
||||
<tspan x="10px" y="226px"><tspan> eyes036, eyes037, eyes038, eyes039</tspan>
|
||||
</tspan>
|
||||
<tspan x="10px" y="244px">
|
||||
<tspan x="10px" y="154px">
|
||||
</tspan>
|
||||
</text>
|
||||
|
||||
|
||||
|
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 1.4 KiB |
@ -1,4 +1,4 @@
|
||||
<svg width="740px" height="560px" xmlns="http://www.w3.org/2000/svg">
|
||||
<svg width="740px" height="128px" xmlns="http://www.w3.org/2000/svg">
|
||||
<style>
|
||||
.fg { fill: #AAAAAA }
|
||||
.bg { background: #000000 }
|
||||
@ -25,59 +25,11 @@
|
||||
</tspan>
|
||||
<tspan x="10px" y="64px"><tspan class="fg-red bold">error</tspan><tspan class="bold">:</tspan><tspan> unrecognized features for crate your-face: eees100, eees101</tspan>
|
||||
</tspan>
|
||||
<tspan x="10px" y="82px"><tspan>disabled features:</tspan>
|
||||
<tspan x="10px" y="82px"><tspan>199 disabled features available</tspan>
|
||||
</tspan>
|
||||
<tspan x="10px" y="100px"><tspan> eyes001, eyes002, eyes003, eyes004, eyes005, eyes006, eyes007, eyes008, eyes009</tspan>
|
||||
<tspan x="10px" y="100px"><tspan>1 enabled features available</tspan>
|
||||
</tspan>
|
||||
<tspan x="10px" y="118px"><tspan> eyes010, eyes011, eyes012, eyes013, eyes014, eyes015, eyes016, eyes017, eyes018</tspan>
|
||||
</tspan>
|
||||
<tspan x="10px" y="136px"><tspan> eyes019, eyes020, eyes021, eyes022, eyes023, eyes024, eyes025, eyes026, eyes027</tspan>
|
||||
</tspan>
|
||||
<tspan x="10px" y="154px"><tspan> eyes028, eyes029, eyes030, eyes031, eyes032, eyes033, eyes034, eyes035, eyes036</tspan>
|
||||
</tspan>
|
||||
<tspan x="10px" y="172px"><tspan> eyes037, eyes038, eyes039, eyes040, eyes041, eyes042, eyes043, eyes044, eyes045</tspan>
|
||||
</tspan>
|
||||
<tspan x="10px" y="190px"><tspan> eyes046, eyes047, eyes048, eyes049, eyes050, eyes051, eyes052, eyes053, eyes054</tspan>
|
||||
</tspan>
|
||||
<tspan x="10px" y="208px"><tspan> eyes055, eyes056, eyes057, eyes058, eyes059, eyes060, eyes061, eyes062, eyes063</tspan>
|
||||
</tspan>
|
||||
<tspan x="10px" y="226px"><tspan> eyes064, eyes065, eyes066, eyes067, eyes068, eyes069, eyes070, eyes071, eyes072</tspan>
|
||||
</tspan>
|
||||
<tspan x="10px" y="244px"><tspan> eyes073, eyes074, eyes075, eyes076, eyes077, eyes078, eyes079, eyes080, eyes081</tspan>
|
||||
</tspan>
|
||||
<tspan x="10px" y="262px"><tspan> eyes082, eyes083, eyes084, eyes085, eyes086, eyes087, eyes088, eyes089, eyes090</tspan>
|
||||
</tspan>
|
||||
<tspan x="10px" y="280px"><tspan> eyes091, eyes092, eyes093, eyes094, eyes095, eyes096, eyes097, eyes098, eyes099</tspan>
|
||||
</tspan>
|
||||
<tspan x="10px" y="298px"><tspan> eyes100, eyes101, eyes102, eyes103, eyes104, eyes105, eyes106, eyes107, eyes108</tspan>
|
||||
</tspan>
|
||||
<tspan x="10px" y="316px"><tspan> eyes109, eyes110, eyes111, eyes112, eyes113, eyes114, eyes115, eyes116, eyes117</tspan>
|
||||
</tspan>
|
||||
<tspan x="10px" y="334px"><tspan> eyes118, eyes119, eyes120, eyes121, eyes122, eyes123, eyes124, eyes125, eyes126</tspan>
|
||||
</tspan>
|
||||
<tspan x="10px" y="352px"><tspan> eyes127, eyes128, eyes129, eyes130, eyes131, eyes132, eyes133, eyes134, eyes135</tspan>
|
||||
</tspan>
|
||||
<tspan x="10px" y="370px"><tspan> eyes136, eyes137, eyes138, eyes139, eyes140, eyes141, eyes142, eyes143, eyes144</tspan>
|
||||
</tspan>
|
||||
<tspan x="10px" y="388px"><tspan> eyes145, eyes146, eyes147, eyes148, eyes149, eyes150, eyes151, eyes152, eyes153</tspan>
|
||||
</tspan>
|
||||
<tspan x="10px" y="406px"><tspan> eyes154, eyes155, eyes156, eyes157, eyes158, eyes159, eyes160, eyes161, eyes162</tspan>
|
||||
</tspan>
|
||||
<tspan x="10px" y="424px"><tspan> eyes163, eyes164, eyes165, eyes166, eyes167, eyes168, eyes169, eyes170, eyes171</tspan>
|
||||
</tspan>
|
||||
<tspan x="10px" y="442px"><tspan> eyes172, eyes173, eyes174, eyes175, eyes176, eyes177, eyes178, eyes179, eyes180</tspan>
|
||||
</tspan>
|
||||
<tspan x="10px" y="460px"><tspan> eyes181, eyes182, eyes183, eyes184, eyes185, eyes186, eyes187, eyes188, eyes189</tspan>
|
||||
</tspan>
|
||||
<tspan x="10px" y="478px"><tspan> eyes190, eyes191, eyes192, eyes193, eyes194, eyes195, eyes196, eyes197, eyes198</tspan>
|
||||
</tspan>
|
||||
<tspan x="10px" y="496px"><tspan> eyes199</tspan>
|
||||
</tspan>
|
||||
<tspan x="10px" y="514px"><tspan>enabled features:</tspan>
|
||||
</tspan>
|
||||
<tspan x="10px" y="532px"><tspan> eyes000</tspan>
|
||||
</tspan>
|
||||
<tspan x="10px" y="550px">
|
||||
<tspan x="10px" y="118px">
|
||||
</tspan>
|
||||
</text>
|
||||
|
||||
|
||||
|
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 1.2 KiB |
Loading…
x
Reference in New Issue
Block a user