Skip to content

Commit 1213fc6

Browse files
committed
Apply rust_2024_incompatible_pat
1 parent 425af55 commit 1213fc6

File tree

9 files changed

+13
-17
lines changed

9 files changed

+13
-17
lines changed

crates/xtask-bump-check/src/xtask.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ fn changed<'r, 'ws>(
368368
for delta in diff.deltas() {
369369
let old = delta.old_file().path().unwrap();
370370
let new = delta.new_file().path().unwrap();
371-
for (ref pkg_root, pkg) in ws_members.iter() {
371+
for (pkg_root, pkg) in ws_members.iter() {
372372
if old.starts_with(pkg_root) || new.starts_with(pkg_root) {
373373
changed_members.insert(pkg.name().as_str(), *pkg);
374374
break;

src/cargo/core/manifest.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1003,7 +1003,7 @@ impl Target {
10031003

10041004
pub fn doctestable(&self) -> bool {
10051005
match self.kind() {
1006-
TargetKind::Lib(ref kinds) => kinds.iter().any(|k| {
1006+
TargetKind::Lib(kinds) => kinds.iter().any(|k| {
10071007
*k == CrateType::Rlib || *k == CrateType::Lib || *k == CrateType::ProcMacro
10081008
}),
10091009
_ => false,

src/cargo/core/resolver/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ fn activate_deps_loop(
447447
frame
448448
.remaining_siblings
449449
.remaining()
450-
.find_map(|(ref new_dep, _, _)| {
450+
.find_map(|(new_dep, _, _)| {
451451
past_conflicting_activations.conflicting(&resolver_ctx, new_dep)
452452
})
453453
{

src/cargo/core/workspace.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,7 @@ impl<'gctx> Workspace<'gctx> {
584584

585585
packages.iter_mut().filter_map(move |(path, package)| {
586586
if members.contains(path) {
587-
if let MaybePackage::Package(ref mut p) = package {
587+
if let MaybePackage::Package(p) = package {
588588
return Some(p);
589589
}
590590
}
@@ -615,7 +615,7 @@ impl<'gctx> Workspace<'gctx> {
615615

616616
packages.iter_mut().filter_map(move |(path, package)| {
617617
if members.contains(path) {
618-
if let MaybePackage::Package(ref mut p) = package {
618+
if let MaybePackage::Package(p) = package {
619619
return Some(p);
620620
}
621621
}
@@ -722,7 +722,7 @@ impl<'gctx> Workspace<'gctx> {
722722
if let Some(root_path) = &self.root_manifest {
723723
let root_package = self.packages.load(root_path)?;
724724
match root_package.workspace_config() {
725-
WorkspaceConfig::Root(ref root_config) => {
725+
WorkspaceConfig::Root(root_config) => {
726726
return Ok(Some(root_config.clone()));
727727
}
728728

src/cargo/ops/cargo_install.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -376,12 +376,12 @@ impl<'gctx> InstallablePackage<'gctx> {
376376
// behavior for this fallback case as well.
377377
if let CompileFilter::Only { bins, examples, .. } = &self.opts.filter {
378378
let mut any_specific = false;
379-
if let FilterRule::Just(ref v) = bins {
379+
if let FilterRule::Just(v) = bins {
380380
if !v.is_empty() {
381381
any_specific = true;
382382
}
383383
}
384-
if let FilterRule::Just(ref v) = examples {
384+
if let FilterRule::Just(v) = examples {
385385
if !v.is_empty() {
386386
any_specific = true;
387387
}

src/cargo/ops/common_for_install_and_uninstall.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -785,11 +785,7 @@ pub fn exe_names(pkg: &Package, filter: &ops::CompileFilter) -> BTreeSet<String>
785785
.filter(|target| target.is_executable())
786786
.map(|target| to_exe(target.name()))
787787
.collect(),
788-
CompileFilter::Only {
789-
ref bins,
790-
ref examples,
791-
..
792-
} => {
788+
CompileFilter::Only { bins, examples, .. } => {
793789
let collect = |rule: &_, f: fn(&Target) -> _| match rule {
794790
FilterRule::All => pkg
795791
.targets()

src/cargo/ops/registry/publish.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ pub fn publish(ws: &Workspace<'_>, opts: &PublishOpts<'_>) -> CargoResult<()> {
140140
None => {
141141
let reg = super::infer_registry(&just_pkgs)?;
142142
validate_registry(&just_pkgs, reg.as_ref())?;
143-
if let Some(RegistryOrIndex::Registry(ref registry)) = &reg {
143+
if let Some(RegistryOrIndex::Registry(registry)) = &reg {
144144
if registry != CRATES_IO_REGISTRY {
145145
// Don't warn for crates.io.
146146
opts.gctx.shell().note(&format!(

src/cargo/util/toml/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -956,7 +956,7 @@ fn load_inheritable_fields(
956956
match workspace_config {
957957
WorkspaceConfig::Root(root) => Ok(root.inheritable().clone()),
958958
WorkspaceConfig::Member {
959-
root: Some(ref path_to_root),
959+
root: Some(path_to_root),
960960
} => {
961961
let path = normalized_path
962962
.parent()
@@ -1674,7 +1674,7 @@ pub fn to_real_manifest(
16741674
.normalized_publish()
16751675
.expect("previously normalized")
16761676
{
1677-
Some(manifest::VecStringOrBool::VecString(ref vecstring)) => Some(vecstring.clone()),
1677+
Some(manifest::VecStringOrBool::VecString(vecstring)) => Some(vecstring.clone()),
16781678
Some(manifest::VecStringOrBool::Bool(false)) => Some(vec![]),
16791679
Some(manifest::VecStringOrBool::Bool(true)) => None,
16801680
None => version.is_none().then_some(vec![]),

tests/testsuite/login.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ pub fn check_token(expected_token: Option<&str>, registry: Option<&str>) {
5353
.get("registry")
5454
.and_then(|registry_table| registry_table.get("token"))
5555
.and_then(|v| match v {
56-
toml::Value::String(ref token) => Some(token.as_str().to_string()),
56+
toml::Value::String(token) => Some(token.as_str().to_string()),
5757
_ => None,
5858
}),
5959
};

0 commit comments

Comments
 (0)