Skip to content

Commit 7d995d7

Browse files
author
bors-servo
authored
Auto merge of #452 - emilio:dont-assert, r=fitzgen
Remove recently-added assertion that can legitimately trigger This fails under BaseErrorResult in Stylo builds. I have no idea right now why that isn't whitelisted (should be, given we're calling it from TErrorResult's code generation). Let's disable this pending further investigation since I don't have time to dig into it right now. r? @fitzgen
2 parents 33df99a + d4f772b commit 7d995d7

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
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.20.4"
16+
version = "0.20.5"
1717
build = "build.rs"
1818

1919
[badges]

src/codegen/mod.rs

+6-1
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,12 @@ impl CodeGenerator for Item {
287287
}
288288

289289
debug!("<Item as CodeGenerator>::codegen: self = {:?}", self);
290-
assert!(whitelisted_items.contains(&self.id()));
290+
if !whitelisted_items.contains(&self.id()) {
291+
// TODO(emilio, #453): Figure out what to do when this happens
292+
// legitimately, we could track the opaque stuff and disable the
293+
// assertion there I guess.
294+
error!("Found non-whitelisted item in code generation: {:?}", self);
295+
}
291296

292297
result.set_seen(self.id());
293298

0 commit comments

Comments
 (0)