Skip to content

Commit

Permalink
Remove redundant dereferences
Browse files Browse the repository at this point in the history
  • Loading branch information
r-darwish committed Sep 2, 2021
1 parent bde3600 commit a39b4f8
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 14 deletions.
3 changes: 1 addition & 2 deletions src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -620,8 +620,7 @@ impl Config {
/// Extra trizen arguments
#[allow(dead_code)]
pub fn trizen_arguments(&self) -> &str {
&self
.config_file
self.config_file
.linux
.as_ref()
.and_then(|s| s.trizen_arguments.as_deref())
Expand Down
8 changes: 4 additions & 4 deletions src/execution_context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,18 @@ impl<'a> ExecutionContext<'a> {
}

pub fn git(&self) -> &Git {
&self.git
self.git
}

pub fn sudo(&self) -> &Option<PathBuf> {
&self.sudo
self.sudo
}

pub fn config(&self) -> &Config {
&self.config
self.config
}

pub fn base_dirs(&self) -> &BaseDirs {
&self.base_dirs
self.base_dirs
}
}
2 changes: 1 addition & 1 deletion src/steps/generic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ pub fn run_micro(run_type: RunType) -> Result<()> {
print_separator("micro");

let stdout = run_type.execute(&micro).args(&["-plugin", "update"]).string_output()?;
std::io::stdout().write_all(&stdout.as_bytes())?;
std::io::stdout().write_all(stdout.as_bytes())?;

if stdout.contains("Nothing to install / update") || stdout.contains("One or more plugins installed") {
Ok(())
Expand Down
6 changes: 3 additions & 3 deletions src/steps/git.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ async fn pull_repository(repo: String, git: &Path, ctx: &ExecutionContext<'_>) -
println!("{} pulling {}", style("Failed").red().bold(), &repo);
print!("{}", message);
} else {
let after_revision = get_head_revision(&git, &repo);
let after_revision = get_head_revision(git, &repo);

match (&before_revision, &after_revision) {
(Some(before), Some(after)) if before != after => {
Expand Down Expand Up @@ -219,7 +219,7 @@ impl Git {
}
_ => true, // repo has remotes or command to check for remotes has failed. proceed to pull anyway.
})
.map(|repo| pull_repository(repo.clone(), &git, ctx));
.map(|repo| pull_repository(repo.clone(), git, ctx));

let stream_of_futures = if let Some(limit) = ctx.config().git_concurrency_limit() {
iter(futures_iterator).buffer_unordered(limit).boxed()
Expand Down Expand Up @@ -267,7 +267,7 @@ impl<'a> Repositories<'a> {
match entry {
Ok(path) => {
if let Some(last_git_repo) = &last_git_repo {
if path.is_descendant_of(&last_git_repo) {
if path.is_descendant_of(last_git_repo) {
debug!(
"Skipping {} because it's a decendant of last known repo {}",
path.display(),
Expand Down
2 changes: 1 addition & 1 deletion src/steps/remote/vagrant.rs
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ pub fn topgrade_vagrant_box(ctx: &ExecutionContext, vagrant_box: &VagrantBox) ->
return Err(SkipStep(format!("Skipping powered off box {}", vagrant_box)).into());
} else {
print_separator(seperator);
_poweron = Some(vagrant.temporary_power_on(&vagrant_box, ctx)?);
_poweron = Some(vagrant.temporary_power_on(vagrant_box, ctx)?);
}
} else {
print_separator(seperator);
Expand Down
2 changes: 1 addition & 1 deletion src/steps/tmux.rs
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ pub fn run_in_tmux(args: &Option<String>) -> ! {
pub fn run_command(ctx: &ExecutionContext, command: &str) -> Result<()> {
Tmux::new(ctx.config().tmux_arguments())
.build()
.args(&["new-window", "-a", "-t", "topgrade:1", &command])
.args(&["new-window", "-a", "-t", "topgrade:1", command])
.env_remove("TMUX")
.spawn()?
.wait()?
Expand Down
4 changes: 2 additions & 2 deletions src/steps/vim.rs
Original file line number Diff line number Diff line change
Expand Up @@ -80,15 +80,15 @@ pub fn upgrade_vim(base_dirs: &BaseDirs, ctx: &ExecutionContext) -> Result<()> {
return Err(SkipStep(String::from("vim binary might by actually nvim")).into());
}

let vimrc = vimrc(&base_dirs)?;
let vimrc = vimrc(base_dirs)?;

print_separator("Vim");
upgrade(&vim, &vimrc, ctx)
}

pub fn upgrade_neovim(base_dirs: &BaseDirs, ctx: &ExecutionContext) -> Result<()> {
let nvim = require("nvim")?;
let nvimrc = nvimrc(&base_dirs)?;
let nvimrc = nvimrc(base_dirs)?;

print_separator("Neovim");
upgrade(&nvim, &nvimrc, ctx)
Expand Down

0 comments on commit a39b4f8

Please sign in to comment.