Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
105 changes: 50 additions & 55 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/cli/self_update/unix.rs
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ pub(crate) fn do_remove_from_path(process: &Process) -> Result<()> {
pub(crate) fn do_add_to_path(process: &Process) -> Result<()> {
for sh in shell::get_available_shells(process) {
let source_cmd = sh.source_string(process)?;
let source_cmd_with_newline = format!("\n{}", &source_cmd);
let source_cmd_with_newline = format!("\n{source_cmd}");

for rc in sh.update_rcs(process) {
let cmd_to_write = match utils::read_file("rcfile", &rc) {
Expand Down
2 changes: 1 addition & 1 deletion src/dist/component/components.rs
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ pub struct Component {

impl Component {
pub(crate) fn manifest_name(&self) -> String {
format!("manifest-{}", &self.name)
format!("manifest-{}", self.name)
}
pub(crate) fn manifest_file(&self) -> PathBuf {
self.components.prefix.manifest_file(&self.manifest_name())
Expand Down
2 changes: 1 addition & 1 deletion src/dist/manifest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,7 @@ impl Manifest {
.unwrap_or_else(|_| {
panic!(
"manifest should contain component {}",
&self.short_name(component)
self.short_name(component)
)
});
let component_target_pkg = component_pkg
Expand Down
2 changes: 1 addition & 1 deletion src/dist/manifestation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -798,7 +798,7 @@ impl<'a> ComponentBinary<'a> {
use tokio_retry::{RetryIf, strategy::FixedInterval};

let url = self.download_cfg.url(&self.binary.url)?;
let installer = RetryIf::spawn(
let installer = RetryIf::start(
FixedInterval::from_millis(0).take(max_retries),
|| {
self.download_cfg
Expand Down
4 changes: 2 additions & 2 deletions src/dist/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -838,7 +838,7 @@ impl fmt::Display for TargetTuple {

impl fmt::Display for PartialToolchainDesc {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(f, "{}", &self.channel)?;
write!(f, "{}", self.channel)?;

if let Some(date) = &self.date {
write!(f, "-{date}")?;
Expand All @@ -859,7 +859,7 @@ impl fmt::Display for PartialToolchainDesc {

impl fmt::Display for ToolchainDesc {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(f, "{}", &self.channel)?;
write!(f, "{}", self.channel)?;

if let Some(date) = &self.date {
write!(f, "-{date}")?;
Expand Down
2 changes: 1 addition & 1 deletion src/utils/raw.rs
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ pub(crate) fn filter_file<F: FnMut(&str) -> bool>(
for result in io::BufRead::lines(&mut reader) {
let line = result?;
if filter(&line) {
writeln!(writer, "{}", &line)?;
writeln!(writer, "{line}")?;
} else {
removed += 1;
}
Expand Down
Loading