Skip to content

Commit 54d4a95

Browse files
committed
fix
1 parent a0872d7 commit 54d4a95

File tree

3 files changed

+8
-11
lines changed

3 files changed

+8
-11
lines changed

crates/compilers/src/artifact_output/mod.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -658,7 +658,7 @@ pub trait ArtifactOutput {
658658
name.push_str(&format!(".{}.{}.{}", version.major, version.minor, version.patch));
659659
}
660660
if with_profile {
661-
name.push_str(&format!(".{}", profile));
661+
name.push_str(&format!(".{profile}"));
662662
}
663663
name.push_str(".json");
664664
name.into()
@@ -806,6 +806,7 @@ pub trait ArtifactOutput {
806806

807807
/// Generates a path for an artifact based on already taken paths by either cached or compiled
808808
/// artifacts.
809+
#[allow(clippy::too_many_arguments)]
809810
fn get_artifact_path(
810811
ctx: &OutputContext<'_>,
811812
already_taken: &HashSet<String>,

crates/compilers/src/compilers/restrictions.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ pub trait CompilerSettingsRestrictions: Debug + Sync + Send + Clone + Default {
99
fn merge(&mut self, other: Self);
1010
}
1111

12-
/// Combines [CompilerVersionRestriction] with a restrictions on compiler versions for a given
12+
/// Combines [CompilerSettingsRestrictions] with a restrictions on compiler versions for a given
1313
/// source file.
1414
#[derive(Debug, Clone, Default)]
1515
pub struct RestrictionsWithVersion<T> {

crates/compilers/src/resolver/mod.rs

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -460,10 +460,10 @@ impl<L: Language, D: ParsedSource<Language = L>> Graph<D> {
460460
///
461461
/// First we determine the compatible version for each input file (from sources and test folder,
462462
/// see `Self::resolve`) and then we add all resolved library imports.
463-
pub fn into_sources_by_version<'a, C, T, S>(
463+
pub fn into_sources_by_version<C, T, S>(
464464
self,
465-
project: &'a Project<C, T>,
466-
) -> Result<(VersionedSources<'a, L, S>, GraphEdges<D>)>
465+
project: &Project<C, T>,
466+
) -> Result<(VersionedSources<'_, L, S>, GraphEdges<D>)>
467467
where
468468
T: ArtifactOutput,
469469
S: CompilerSettings,
@@ -535,11 +535,7 @@ impl<L: Language, D: ParsedSource<Language = L>> Graph<D> {
535535
&mut processed_sources,
536536
);
537537
}
538-
versioned_sources.push((
539-
version.clone(),
540-
sources,
541-
profiles[profile_idx].clone(),
542-
));
538+
versioned_sources.push((version.clone(), sources, profiles[profile_idx]));
543539
}
544540
}
545541

@@ -618,7 +614,7 @@ impl<L: Language, D: ParsedSource<Language = L>> Graph<D> {
618614
let node = self.node(node);
619615
if let Some(requirement) = project.restrictions.get(&node.path) {
620616
candidates
621-
.retain(|(_, (_, settings))| settings.satisfies_restrictions(&*requirement));
617+
.retain(|(_, (_, settings))| settings.satisfies_restrictions(&**requirement));
622618
}
623619
if candidates.is_empty() {
624620
// nothing to filter anymore

0 commit comments

Comments
 (0)