Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update cargo dep to 0.66 #6

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update cargo dep to 0.66 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
136 changes: 108 additions & 28 deletions Cargo.lock
View file
Open in desktop

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

5 changes: 3 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ repository = "https://github.com/not-fl3/cargo-apk"
edition = "2018"

[dependencies]
cargo = "0.62.0"
cargo-util = "0.1"
cargo = "0.66.0"
cargo-util = "=0.2.1"
cargo-platform = "=0.1.2"
clap = "3.1.0"
itertools = "0.8.2"
dirs = "2.0.2"
Expand Down
8 changes: 4 additions & 4 deletions src/ops/build/compile.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ impl Executor for SharedLibraryExecutor {
if mode == CompileMode::Build
&& (target.kind() == &TargetKind::Bin || target.kind() == &TargetKind::ExampleBin)
{
let mut new_args = cmd.get_args().to_owned();
let mut new_args: Vec<_> = cmd.get_args().cloned().collect();

let target_config = self
.config
Expand Down Expand Up @@ -393,7 +393,7 @@ impl Executor for SharedLibraryExecutor {
// This occurs when --all-targets is specified
eprintln!("Ignoring CompileMode::Test for target: {}", target.name());
} else if mode == CompileMode::Build {
let mut new_args = cmd.get_args().to_owned();
let mut new_args: Vec<_> = cmd.get_args().cloned().collect();

//
// Change crate-type from cdylib to rlib
Expand Down Expand Up @@ -466,9 +466,9 @@ fn list_android_dylibs(version_specific_libraries_path: &Path) -> CargoResult<Ha
}

/// Get native library search paths from rustc args
fn libs_search_paths_from_args(args: &[std::ffi::OsString]) -> Vec<PathBuf> {
fn libs_search_paths_from_args<'a>(args: impl Iterator<Item=&'a std::ffi::OsString>) -> Vec<PathBuf> {
let mut is_search_path = false;
args.iter()
args
.filter_map(|arg| {
if is_search_path {
is_search_path = false;
Expand Down