Skip to content

Commit 293582d

Browse files
authored
Merge pull request #3 from vadorovsky/llvm-15
Bump llvm-sys to version 150
2 parents 7eec446 + dc9a0d3 commit 293582d

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ libloading = "0.5"
1515
lazy_static = "1.0"
1616
failure = "0.1"
1717
libc = "0.2"
18-
llvm-sys = { version = "140", features = ["no-llvm-linking", "disable-alltargets-init"] }
18+
llvm-sys = { version = "150", features = ["no-llvm-linking", "disable-alltargets-init"] }
1919

2020
[build-dependencies]
2121
cargo_metadata = "0.8"

build.rs

+8-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,14 @@ mod llvm {
129129
"create_proxy!({}; {}; {});",
130130
decl.name,
131131
decl.ret_ty,
132-
decl.args.trim_end_matches(',')
132+
decl.args
133+
// We cannot use `Err` as an argument name provided to
134+
// the macro, it conflicts with the `Err` tuple variant
135+
// from Rust std preludes. That `Err` comes from the
136+
// `pub type` declaration, where using it allowed.
137+
// https://play.rust-lang.org/?gist=ef464634c9ee2193c08f6d97bdba5dd2
138+
.replace("Err :", "Error :")
139+
.trim_end_matches(',')
133140
)?;
134141
}
135142

src/init.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const POSSIBLE_BACKENDS: &[&str] = &[
1010
];
1111

1212
fn get_native_arch() -> Result<String> {
13-
let output = Command::new("rustc").args(&["--print", "cfg"]).output()?;
13+
let output = Command::new("rustc").args(["--print", "cfg"]).output()?;
1414
let buf = BufReader::new(output.stdout.as_slice());
1515
for line in buf.lines() {
1616
let line = line?;

0 commit comments

Comments
 (0)