File tree 3 files changed +10
-3
lines changed
3 files changed +10
-3
lines changed Original file line number Diff line number Diff line change @@ -15,7 +15,7 @@ libloading = "0.5"
15
15
lazy_static = " 1.0"
16
16
failure = " 0.1"
17
17
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" ] }
19
19
20
20
[build-dependencies ]
21
21
cargo_metadata = " 0.8"
Original file line number Diff line number Diff line change @@ -129,7 +129,14 @@ mod llvm {
129
129
"create_proxy!({}; {}; {});" ,
130
130
decl. name,
131
131
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( ',' )
133
140
) ?;
134
141
}
135
142
Original file line number Diff line number Diff line change @@ -10,7 +10,7 @@ const POSSIBLE_BACKENDS: &[&str] = &[
10
10
] ;
11
11
12
12
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 ( ) ?;
14
14
let buf = BufReader :: new ( output. stdout . as_slice ( ) ) ;
15
15
for line in buf. lines ( ) {
16
16
let line = line?;
You can’t perform that action at this time.
0 commit comments