gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chore: cargo +nightly clippy --fix -Z unstable-options

Browse Source
This commit is contained in:
Alexander Meißner
2021-06-18 15:34:46 +02:00
committed by Michael Vines
parent 3570b00560
commit 6514096a67
177 changed files with 1021 additions and 1021 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sdk/cargo-build-bpf/src/main.rs
View File

@ -114,7 +114,7 @@ fn install_if_missing(
url.push_str(version);
url.push('/');
url.push_str(file.to_str().unwrap());
download_file(&url.as_str(), &file, true, &mut None)?;
download_file(url.as_str(), file, true, &mut None)?;
fs::create_dir_all(&target_path).map_err(|err| err.to_string())?;
let zip = File::open(&file).map_err(|err| err.to_string())?;
let tar = BzDecoder::new(BufReader::new(zip));
@ -412,14 +412,14 @@ fn build_bpf_package(config: &Config, target_directory: &Path, package: &cargo_m
"solana-bpf-tools-linux.tar.bz2"
};
install_if_missing(
&config,
config,
"bpf-tools",
"v1.10",
"https://github.com/solana-labs/bpf-tools/releases/download",
&PathBuf::from(bpf_tools_filename),
)
.expect("Failed to install bpf-tools");
link_bpf_toolchain(&config);
link_bpf_toolchain(config);
let llvm_bin = config
.bpf_sdk
@ -530,7 +530,7 @@ fn build_bpf_package(config: &Config, target_directory: &Path, package: &cargo_m
postprocess_dump(&program_dump);
}
check_undefined_symbols(&config, &program_so);
check_undefined_symbols(config, &program_so);
println!();
println!("To deploy this program:");
@ -556,7 +556,7 @@ fn build_bpf(config: Config, manifest_path: Option<PathBuf>) {
if let Some(root_package) = metadata.root_package() {
if !config.workspace {
build_bpf_package(&config, &metadata.target_directory.as_ref(), root_package);
build_bpf_package(&config, metadata.target_directory.as_ref(), root_package);
return;
}
}
@ -577,7 +577,7 @@ fn build_bpf(config: Config, manifest_path: Option<PathBuf>) {
.collect::<Vec<_>>();
for package in all_bpf_packages {
build_bpf_package(&config, &metadata.target_directory.as_ref(), package);
build_bpf_package(&config, metadata.target_directory.as_ref(), package);
}
}