Skip to content

Commit

Permalink
Update syn related dependencies and bump version
Browse files Browse the repository at this point in the history
  • Loading branch information
Eijebong authored and emilio committed Sep 2, 2019
1 parent 84ea6bf commit ac99aa1
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 24 deletions.
22 changes: 11 additions & 11 deletions Cargo.lock

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

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ readme = "README.md"
repository = "https://github.com/rust-lang/rust-bindgen"
documentation = "https://docs.rs/bindgen"
homepage = "https://rust-lang.github.io/rust-bindgen/"
version = "0.51.0"
version = "0.51.1"
build = "build.rs"

include = [
Expand Down Expand Up @@ -52,14 +52,14 @@ clap = { version = "2", optional = true }
clang-sys = { version = "0.28.0", features = ["runtime", "clang_6_0"] }
lazy_static = "1"
peeking_take_while = "0.1.2"
quote = { version = "0.6", default-features = false }
quote = { version = "1", default-features = false }
regex = "1.0"
which = ">=1.0, <3.0"
shlex = "0.1"
fxhash = "0.2"
# New validation in 0.3.6 breaks bindgen-integration:
# https://github.com/alexcrichton/proc-macro2/commit/489c642.
proc-macro2 = { version = "0.4", default-features = false }
proc-macro2 = { version = "1", default-features = false }

[dependencies.env_logger]
optional = true
Expand Down
2 changes: 1 addition & 1 deletion src/ir/traversal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -511,6 +511,6 @@ mod tests {
#[allow(dead_code)]
fn traversal_predicate_is_object_safe() {
// This should compile only if TraversalPredicate is object safe.
fn takes_by_trait_object(_: &TraversalPredicate) {}
fn takes_by_trait_object(_: &dyn TraversalPredicate) {}
}
}
12 changes: 6 additions & 6 deletions tests/expectations/tests/objc_class_method.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,31 +22,31 @@ pub trait Foo {
impl Foo for id {
unsafe fn method() {
msg_send!(
objc::runtime::Class::get("Foo").expect("Couldn\'t find Foo"),
objc::runtime::Class::get("Foo").expect("Couldn't find Foo"),
method
)
}
unsafe fn methodWithInt_(foo: ::std::os::raw::c_int) {
msg_send!(
objc::runtime::Class::get("Foo").expect("Couldn\'t find Foo"),
objc::runtime::Class::get("Foo").expect("Couldn't find Foo"),
methodWithInt: foo
)
}
unsafe fn methodWithFoo_(foo: id) {
msg_send!(
objc::runtime::Class::get("Foo").expect("Couldn\'t find Foo"),
objc::runtime::Class::get("Foo").expect("Couldn't find Foo"),
methodWithFoo: foo
)
}
unsafe fn methodReturningInt() -> ::std::os::raw::c_int {
msg_send!(
objc::runtime::Class::get("Foo").expect("Couldn\'t find Foo"),
objc::runtime::Class::get("Foo").expect("Couldn't find Foo"),
methodReturningInt
)
}
unsafe fn methodReturningFoo() -> *mut id {
msg_send!(
objc::runtime::Class::get("Foo").expect("Couldn\'t find Foo"),
objc::runtime::Class::get("Foo").expect("Couldn't find Foo"),
methodReturningFoo
)
}
Expand All @@ -55,6 +55,6 @@ impl Foo for id {
ptr: *mut ::std::os::raw::c_char,
floatvalue: f32,
) {
msg_send ! ( objc :: runtime :: Class :: get ( "Foo" ) . expect ( "Couldn\'t find Foo" ) , methodWithArg1 : intvalue andArg2 : ptr andArg3 : floatvalue )
msg_send ! ( objc :: runtime :: Class :: get ( "Foo" ) . expect ( "Couldn't find Foo" ) , methodWithArg1 : intvalue andArg2 : ptr andArg3 : floatvalue )
}
}
2 changes: 1 addition & 1 deletion tests/expectations/tests/objc_method_clash.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ impl Foo for id {
}
unsafe fn class_foo() {
msg_send!(
objc::runtime::Class::get("Foo").expect("Couldn\'t find Foo"),
objc::runtime::Class::get("Foo").expect("Couldn't find Foo"),
foo
)
}
Expand Down
4 changes: 2 additions & 2 deletions tests/expectations/tests/objc_whitelist.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ impl protocol_SomeProtocol for id {
}
unsafe fn protocolClassMethod() {
msg_send!(
objc::runtime::Class::get("SomeProtocol").expect("Couldn\'t find SomeProtocol"),
objc::runtime::Class::get("SomeProtocol").expect("Couldn't find SomeProtocol"),
protocolClassMethod
)
}
Expand All @@ -32,7 +32,7 @@ impl WhitelistMe for id {
}
unsafe fn classMethod() {
msg_send!(
objc::runtime::Class::get("WhitelistMe").expect("Couldn\'t find WhitelistMe"),
objc::runtime::Class::get("WhitelistMe").expect("Couldn't find WhitelistMe"),
classMethod
)
}
Expand Down

0 comments on commit ac99aa1

Please sign in to comment.