Skip to content

Fix create_proxy! macro #12

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

Merged
merged 2 commits into from
Jan 2, 2020
Merged

Fix create_proxy! macro #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f8b75b
Format
termoshtt Dec 31, 2019
74424a5
Trim end comma
termoshtt Dec 31, 2019
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
4 changes: 3 additions & 1 deletion build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,9 @@ mod llvm {
writeln!(
file,
"create_proxy!({}; {}; {});",
decl.name, decl.ret_ty, decl.args
decl.name,
decl.ret_ty,
decl.args.trim_end_matches(",")
)?;
}

Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,10 @@ pub mod proxy {

use llvm_sys::analysis::*;
use llvm_sys::debuginfo::*;
use llvm_sys::execution_engine::*;
use llvm_sys::disassembler::*;
use llvm_sys::error::*;
use llvm_sys::error_handling::*;
use llvm_sys::execution_engine::*;
use llvm_sys::link_time_optimizer::*;
use llvm_sys::lto::*;
use llvm_sys::object::*;
Expand Down
3 changes: 2 additions & 1 deletion src/path.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@ fn collect_possible_paths() -> Result<Vec<PathBuf>, Error> {
cargo_path.pop();

if let Some(toolchain) = cargo_path.file_name() {
let arch = env::var("HOST").unwrap_or_else(|_| extract_arch(toolchain.to_str().unwrap()));
let arch =
env::var("HOST").unwrap_or_else(|_| extract_arch(toolchain.to_str().unwrap()));

paths.push(
cargo_path
Expand Down