Skip to content

Commit 4189347

Browse files
octylFractaloctylFractal
committed
Cargo format
1 parent 3a57f78 commit 4189347

File tree

4 files changed

+37
-24
lines changed

4 files changed

+37
-24
lines changed

‎src/adoptjdk.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,9 @@ pub fn get_latest_jdk_version(major: u8) -> Result<String> {
8383
let page: JdkVersionsPage = response
8484
.json()
8585
.context("Failed to get JSON from Adopt API")?;
86-
let ga_only_versions = page.versions.iter()
86+
let ga_only_versions = page
87+
.versions
88+
.iter()
8789
.filter(|v| v.pre.is_none())
8890
.collect::<Vec<_>>();
8991
if ga_only_versions.is_empty() {

‎src/config.rs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
use std::path::PathBuf;
22

33
use anyhow::{anyhow, Context, Result};
4+
use directories_next::ProjectDirs;
45
use once_cell::sync::Lazy;
56
use serde::{Deserialize, Serialize};
6-
use directories_next::ProjectDirs;
77

8-
pub static PROJECT_DIRS: Lazy<ProjectDirs> = Lazy::new(||
9-
ProjectDirs::from("net", "octyl", "jpre").expect("No project dirs derived?")
10-
);
8+
pub static PROJECT_DIRS: Lazy<ProjectDirs> =
9+
Lazy::new(|| ProjectDirs::from("net", "octyl", "jpre").expect("No project dirs derived?"));
1110

1211
static CONFIG_FILE: Lazy<PathBuf> = Lazy::new(|| PROJECT_DIRS.config_dir().join("config.toml"));
1312

‎src/jdk_manager.rs‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use std::collections::HashMap;
22
use std::ffi::CStr;
33
use std::fs::{create_dir_all, File};
44
use std::io;
5-
use std::io::{Read, BufReader};
5+
use std::io::{BufReader, Read};
66
use std::path::{Path, PathBuf};
77

88
use anyhow::{anyhow, Context, Result};
@@ -16,7 +16,8 @@ use crate::content_disposition_parser::parse_filename;
1616
use crate::http_failure::handle_response_fail;
1717
use crate::progress::new_progress_bar;
1818

19-
static BASE_PATH: Lazy<PathBuf> = Lazy::new(|| crate::config::PROJECT_DIRS.cache_dir().join("jdks"));
19+
static BASE_PATH: Lazy<PathBuf> =
20+
Lazy::new(|| crate::config::PROJECT_DIRS.cache_dir().join("jdks"));
2021
static BY_TTY: Lazy<PathBuf> = Lazy::new(|| std::env::temp_dir().join("jpre-by-tty"));
2122

2223
pub fn get_symlink_location() -> Result<PathBuf> {
@@ -54,11 +55,15 @@ pub fn get_jdk_version(major: u8) -> Option<String> {
5455
debug!("No release file exists in JDK {}", major);
5556
return None;
5657
}
57-
let config = std::fs::read_to_string(release)
58+
let config = std::fs::read_to_string(&release)
5859
.context("Failed to read release file")
5960
.and_then(|data| {
60-
toml::from_str::<HashMap<String, String>>(data.as_str())
61-
.context("Failed to parse TOML from release file")
61+
toml::from_str::<HashMap<String, String>>(data.as_str()).with_context(|| {
62+
format!(
63+
"Failed to parse TOML from release file '{}'",
64+
release.display()
65+
)
66+
})
6267
});
6368
match config {
6469
Ok(map) => map.get("JAVA_VERSION").map(|v| v.clone()),
@@ -191,14 +196,12 @@ fn finish_extract(
191196
.read_dir()
192197
.context("Failed to read temp dir")?
193198
.map(|res| res.map(|e| e.path()))
194-
.filter(|r| {
195-
match r {
196-
Ok(p) => match p.file_name() {
197-
Some(name) => !name.to_string_lossy().starts_with("."),
198-
_ => true,
199-
}
199+
.filter(|r| match r {
200+
Ok(p) => match p.file_name() {
201+
Some(name) => !name.to_string_lossy().starts_with("."),
200202
_ => true,
201-
}
203+
},
204+
_ => true,
202205
})
203206
.collect::<Result<Vec<_>, io::Error>>()
204207
.context("Failed to read temp dir entry")?;
@@ -228,7 +231,8 @@ fn unarchive_tar_gz(path: &Path, expected_size: Option<u64>, reader: impl Read +
228231

229232
let static_path = path.to_path_buf();
230233
let _ = std::thread::spawn(move || {
231-
let gz_decode = libflate::gzip::Decoder::new(BufReader::new(download_bar.wrap_read(reader))).unwrap();
234+
let gz_decode =
235+
libflate::gzip::Decoder::new(BufReader::new(download_bar.wrap_read(reader))).unwrap();
232236
let mut archive = tar::Archive::new(BufReader::new(writing_bar.wrap_read(gz_decode)));
233237
archive.set_preserve_permissions(true);
234238
archive.set_overwrite(true);

‎src/main.rs‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,17 @@ fn main() {
122122

123123
fn main_for_result(args: Jpre) -> Result<()> {
124124
let mut config = Configuration::new().context("Failed to load config")?;
125-
stderrlog::new().verbosity(args.verbose).init().context("Failed to initialize logging")?;
125+
stderrlog::new()
126+
.verbosity(args.verbose)
127+
.init()
128+
.context("Failed to initialize logging")?;
126129
match args.cmd {
127130
Subcommand::Use { jdk } => {
128131
check_env_bound().context("Failed to check environment variables")?;
129-
let jdk_major = load_default(&config, jdk).context("Failed to load default JDK binding")?;
130-
jdk_manager::symlink_jdk_path(jdk_major).context("Failed to overwrite symlink with JDK binding")?;
132+
let jdk_major =
133+
load_default(&config, jdk).context("Failed to load default JDK binding")?;
134+
jdk_manager::symlink_jdk_path(jdk_major)
135+
.context("Failed to overwrite symlink with JDK binding")?;
131136
let jdk_version =
132137
jdk_manager::get_jdk_version(jdk_major).context("Failed to get JDK version")?;
133138
eprintln!("{}", format!("Now using JDK {}", jdk_version).green());
@@ -139,7 +144,8 @@ fn main_for_result(args: Jpre) -> Result<()> {
139144

140145
for major in majors {
141146
if let Some((_, version)) = versions.iter().filter(|(x, _)| *x == major).next() {
142-
let latest = adoptjdk::get_latest_jdk_version(major).context("Failed to get latest JDK version")?;
147+
let latest = adoptjdk::get_latest_jdk_version(major)
148+
.context("Failed to get latest JDK version")?;
143149
if latest != *version {
144150
println!(
145151
"{} {}",
@@ -169,7 +175,8 @@ fn main_for_result(args: Jpre) -> Result<()> {
169175
}
170176
}
171177
Subcommand::List {} => {
172-
let majors = jdk_manager::get_all_jdk_majors().context("Failed to load all installed JDKs")?;
178+
let majors =
179+
jdk_manager::get_all_jdk_majors().context("Failed to load all installed JDKs")?;
173180
if majors.is_empty() {
174181
eprintln!("{}", "No JDKs installed.".yellow());
175182
return Ok(());
@@ -209,7 +216,8 @@ fn main_for_result(args: Jpre) -> Result<()> {
209216
}
210217
}
211218
Subcommand::JavaHome {} => {
212-
let symlink_location = jdk_manager::get_symlink_location().context("Failed to get symlink binding")?;
219+
let symlink_location =
220+
jdk_manager::get_symlink_location().context("Failed to get symlink binding")?;
213221
if !symlink_location.exists() {
214222
// Initialize with default
215223
if let Ok(default) = config.resolve_default() {

0 commit comments

Comments
 (0)