Skip to content

Commit 540b86a

Browse files
epageepage
committed
style: Make clippy happy
1 parent d722ed8 commit 540b86a

File tree

5 files changed

+106
-114
lines changed

5 files changed

+106
-114
lines changed

‎src/bin/set-version/set_version.rs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -179,20 +179,20 @@ fn exec(args: VersionArgs) -> CargoResult<()> {
179179

180180
if update_workspace_version {
181181
let mut ws_manifest = LocalManifest::try_new(&root_manifest_path)?;
182-
if let Some(current) = ws_manifest.get_workspace_version() {
183-
if let Some(next) = target.bump(&current, metadata.as_deref())? {
184-
shell_status(
185-
"Upgrading",
186-
&format!("workspace version from {current} to {next}"),
187-
)?;
188-
ws_manifest.set_workspace_version(&next);
189-
changed = true;
190-
if !dry_run {
191-
ws_manifest.write()?;
192-
}
193-
194-
// Deferring `update_dependents` to the per-package logic
182+
if let Some(current) = ws_manifest.get_workspace_version()
183+
&& let Some(next) = target.bump(&current, metadata.as_deref())?
184+
{
185+
shell_status(
186+
"Upgrading",
187+
&format!("workspace version from {current} to {next}"),
188+
)?;
189+
ws_manifest.set_workspace_version(&next);
190+
changed = true;
191+
if !dry_run {
192+
ws_manifest.write()?;
195193
}
194+
195+
// Deferring `update_dependents` to the per-package logic
196196
}
197197
}
198198

‎src/bin/upgrade/upgrade.rs‎

Lines changed: 65 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -349,76 +349,75 @@ fn exec(args: UpgradeArgs) -> CargoResult<()> {
349349
None
350350
};
351351

352-
if new_version_req.is_none() {
353-
if let Some(Some(explicit_version_req)) =
352+
if new_version_req.is_none()
353+
&& let Some(Some(explicit_version_req)) =
354354
selected_dependencies.get(&dependency.name)
355-
{
355+
{
356+
if is_pinned_dep && !args.pinned.as_bool() {
357+
// `--pinned` is required in case the user meant an unpinned version
358+
// in the dependency tree
359+
reason.get_or_insert(Reason::Pinned);
360+
pinned_present = true;
361+
} else {
362+
new_version_req = Some(explicit_version_req.to_owned())
363+
}
364+
}
365+
366+
if new_version_req.is_none()
367+
&& let Some(latest_incompatible) = &latest_incompatible
368+
{
369+
let new_version: semver::Version = latest_incompatible.parse()?;
370+
let req_candidate =
371+
match cargo_edit::upgrade_requirement(&old_version_req, &new_version) {
372+
Ok(Some(version_req)) => Some(version_req),
373+
Err(_) => {
374+
// Didn't know how to preserve existing format, so abandon it
375+
Some(latest_incompatible.clone())
376+
}
377+
_ => {
378+
// Already at latest
379+
None
380+
}
381+
};
382+
383+
if req_candidate.is_some() {
356384
if is_pinned_dep && !args.pinned.as_bool() {
357-
// `--pinned` is required in case the user meant an unpinned version
358-
// in the dependency tree
385+
// `--pinned` is required for incompatible upgrades
359386
reason.get_or_insert(Reason::Pinned);
360387
pinned_present = true;
388+
} else if !args.incompatible.as_bool() && !is_pinned_dep {
389+
// `--incompatible` is required for non-pinned deps
390+
reason.get_or_insert(Reason::Incompatible);
391+
incompatible_present = true;
361392
} else {
362-
new_version_req = Some(explicit_version_req.to_owned())
393+
new_version_req = req_candidate;
363394
}
364395
}
365396
}
366397

367-
if new_version_req.is_none() {
368-
if let Some(latest_incompatible) = &latest_incompatible {
369-
let new_version: semver::Version = latest_incompatible.parse()?;
370-
let req_candidate =
371-
match cargo_edit::upgrade_requirement(&old_version_req, &new_version) {
372-
Ok(Some(version_req)) => Some(version_req),
373-
Err(_) => {
374-
// Didn't know how to preserve existing format, so abandon it
375-
Some(latest_incompatible.clone())
376-
}
377-
_ => {
378-
// Already at latest
379-
None
380-
}
381-
};
382-
383-
if req_candidate.is_some() {
384-
if is_pinned_dep && !args.pinned.as_bool() {
385-
// `--pinned` is required for incompatible upgrades
386-
reason.get_or_insert(Reason::Pinned);
387-
pinned_present = true;
388-
} else if !args.incompatible.as_bool() && !is_pinned_dep {
389-
// `--incompatible` is required for non-pinned deps
390-
reason.get_or_insert(Reason::Incompatible);
391-
incompatible_present = true;
392-
} else {
393-
new_version_req = req_candidate;
398+
if new_version_req.is_none()
399+
&& let Some(latest_compatible) = &latest_compatible
400+
{
401+
// Compatible upgrades are allowed for pinned
402+
let new_version: semver::Version = latest_compatible.parse()?;
403+
let req_candidate =
404+
match cargo_edit::upgrade_requirement(&old_version_req, &new_version) {
405+
Ok(Some(version_req)) => Some(version_req),
406+
Err(_) => {
407+
// Do not change syntax for compatible upgrades
408+
Some(old_version_req.clone())
394409
}
395-
}
396-
}
397-
}
398-
399-
if new_version_req.is_none() {
400-
if let Some(latest_compatible) = &latest_compatible {
401-
// Compatible upgrades are allowed for pinned
402-
let new_version: semver::Version = latest_compatible.parse()?;
403-
let req_candidate =
404-
match cargo_edit::upgrade_requirement(&old_version_req, &new_version) {
405-
Ok(Some(version_req)) => Some(version_req),
406-
Err(_) => {
407-
// Do not change syntax for compatible upgrades
408-
Some(old_version_req.clone())
409-
}
410-
_ => {
411-
// Already at latest
412-
None
413-
}
414-
};
415-
416-
if req_candidate.is_some() {
417-
if !args.compatible.as_bool() {
418-
reason.get_or_insert(Reason::Compatible);
419-
} else {
420-
new_version_req = req_candidate;
410+
_ => {
411+
// Already at latest
412+
None
421413
}
414+
};
415+
416+
if req_candidate.is_some() {
417+
if !args.compatible.as_bool() {
418+
reason.get_or_insert(Reason::Compatible);
419+
} else {
420+
new_version_req = req_candidate;
422421
}
423422
}
424423
}
@@ -787,14 +786,11 @@ impl Dep {
787786
.latest_version
788787
.as_ref()
789788
.and_then(|v| semver::Version::parse(v).ok())
789+
&& let Some(new_version_req) = &self.new_version_req
790+
&& let Ok(new_version_req) = VersionReq::parse(new_version_req)
791+
&& !new_version_req.matches(&latest_version)
790792
{
791-
if let Some(new_version_req) = &self.new_version_req {
792-
if let Ok(new_version_req) = VersionReq::parse(new_version_req) {
793-
if !new_version_req.matches(&latest_version) {
794-
spec.set_fg(Some(Color::Red));
795-
}
796-
}
797-
}
793+
spec.set_fg(Some(Color::Red));
798794
}
799795
spec
800796
}
@@ -846,12 +842,10 @@ impl Dep {
846842
.latest_version
847843
.as_ref()
848844
.and_then(|v| semver::Version::parse(v).ok())
845+
&& let Some(old_version_req) = &self.old_version_req
846+
&& let Ok(old_version_req) = VersionReq::parse(old_version_req)
849847
{
850-
if let Some(old_version_req) = &self.old_version_req {
851-
if let Ok(old_version_req) = VersionReq::parse(old_version_req) {
852-
return old_version_req.matches(&latest_version);
853-
}
854-
}
848+
return old_version_req.matches(&latest_version);
855849
}
856850
true
857851
}

‎src/dependency.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -363,10 +363,10 @@ impl Dependency {
363363
}
364364
None => {}
365365
}
366-
if table.contains_key("version") {
367-
if let Some(r) = self.registry.as_deref() {
368-
table.insert("registry", r.into());
369-
}
366+
if table.contains_key("version")
367+
&& let Some(r) = self.registry.as_deref()
368+
{
369+
table.insert("registry", r.into());
370370
}
371371

372372
if self.rename.is_some() {

‎src/index.rs‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -243,13 +243,12 @@ impl RemoteIndex {
243243
if let Some(etag) = res
244244
.headers()
245245
.get(tame_index::external::reqwest::header::ETAG)
246+
&& let Ok(etag) = etag.to_str()
246247
{
247-
if let Ok(etag) = etag.to_str() {
248-
if let Some(i) = self.etags.iter().position(|(krate, _)| krate == name) {
249-
etag.clone_into(&mut self.etags[i].1);
250-
} else {
251-
self.etags.push((name.to_owned(), etag.to_owned()));
252-
}
248+
if let Some(i) = self.etags.iter().position(|(krate, _)| krate == name) {
249+
etag.clone_into(&mut self.etags[i].1);
250+
} else {
251+
self.etags.push((name.to_owned(), etag.to_owned()));
253252
}
254253
}
255254

‎src/manifest.rs‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -366,15 +366,14 @@ impl LocalManifest {
366366
/// Remove references to `dep_key` if its no longer present
367367
pub fn gc_dep(&mut self, dep_key: &str) {
368368
let status = self.dep_feature(dep_key);
369-
if matches!(status, FeatureStatus::None | FeatureStatus::DepFeature) {
370-
if let toml_edit::Item::Table(feature_table) = &mut self.data.as_table_mut()["features"]
371-
{
372-
for (_feature, mut activated_crates) in feature_table.iter_mut() {
373-
if let toml_edit::Item::Value(toml_edit::Value::Array(feature_activations)) =
374-
&mut activated_crates
375-
{
376-
remove_feature_activation(feature_activations, dep_key, status);
377-
}
369+
if matches!(status, FeatureStatus::None | FeatureStatus::DepFeature)
370+
&& let toml_edit::Item::Table(feature_table) = &mut self.data.as_table_mut()["features"]
371+
{
372+
for (_feature, mut activated_crates) in feature_table.iter_mut() {
373+
if let toml_edit::Item::Value(toml_edit::Value::Array(feature_activations)) =
374+
&mut activated_crates
375+
{
376+
remove_feature_activation(feature_activations, dep_key, status);
378377
}
379378
}
380379
}
@@ -383,17 +382,17 @@ impl LocalManifest {
383382
fn dep_feature(&self, dep_key: &str) -> FeatureStatus {
384383
let mut status = FeatureStatus::None;
385384
for (_, tbl) in self.get_sections() {
386-
if let toml_edit::Item::Table(tbl) = tbl {
387-
if let Some(dep_item) = tbl.get(dep_key) {
388-
let optional = dep_item.get("optional");
389-
let optional = optional.and_then(|i| i.as_value());
390-
let optional = optional.and_then(|i| i.as_bool());
391-
let optional = optional.unwrap_or(false);
392-
if optional {
393-
return FeatureStatus::Feature;
394-
} else {
395-
status = FeatureStatus::DepFeature;
396-
}
385+
if let toml_edit::Item::Table(tbl) = tbl
386+
&& let Some(dep_item) = tbl.get(dep_key)
387+
{
388+
let optional = dep_item.get("optional");
389+
let optional = optional.and_then(|i| i.as_value());
390+
let optional = optional.and_then(|i| i.as_bool());
391+
let optional = optional.unwrap_or(false);
392+
if optional {
393+
return FeatureStatus::Feature;
394+
} else {
395+
status = FeatureStatus::DepFeature;
397396
}
398397
}
399398
}

0 commit comments

Comments
 (0)