Skip to content

Commit c8f1855

Browse files
author
bors-servo
authored
Auto merge of #504 - emilio:xidorn-template-specialization, r=emilio
Don't mangle name in partial specification (with Cargo.lock update)
2 parents 9409549 + c952b14 commit c8f1855

File tree

5 files changed

+20
-2
lines changed

5 files changed

+20
-2
lines changed

Cargo.lock

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ name = "bindgen"
1313
readme = "README.md"
1414
repository = "https://github.com/servo/rust-bindgen"
1515
documentation = "https://docs.rs/bindgen"
16-
version = "0.21.2"
16+
version = "0.21.3"
1717
build = "build.rs"
1818

1919
exclude = ["tests/headers", "tests/expectations", "bindgen-integration", "ci"]

src/clang.rs

+1
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,7 @@ impl Cursor {
225225
/// remaining free template arguments?
226226
pub fn is_fully_specialized_template(&self) -> bool {
227227
self.is_template_specialization() &&
228+
self.kind() != CXCursor_ClassTemplatePartialSpecialization &&
228229
self.num_template_args().unwrap_or(0) > 0
229230
}
230231

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
/* automatically generated by rust-bindgen */
2+
3+
4+
#![allow(non_snake_case)]
5+
6+
7+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// bindgen-flags: -- --target=x86_64-pc-win32
2+
3+
template<typename Method, bool Cancelable>
4+
struct nsRunnableMethodTraits;
5+
6+
template<class C, typename R, bool Cancelable, typename... As>
7+
struct nsRunnableMethodTraits<R(C::*)(As...), Cancelable>
8+
{
9+
static const bool can_cancel = Cancelable;
10+
};

0 commit comments

Comments
 (0)