diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-04-27 08:42:42 -0500 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-04-27 08:42:42 -0500 |
| commit | 92359c7b9addfe7ee161760aad20368bafd76c26 (patch) | |
| tree | 4a4997a535f1073f4fed382d0bd2f22a6515d1ce /components/script/dom/bindings/codegen/CodegenRust.py | |
| parent | 56105e9f2fb390b431416473a616000636ad409c (diff) | |
| parent | d4f809f95ed5687f38d043a5d8b7afd8020683d5 (diff) | |
| download | servo-92359c7b9addfe7ee161760aad20368bafd76c26.tar.gz servo-92359c7b9addfe7ee161760aad20368bafd76c26.zip | |
Auto merge of #5850 - nox:nullary-callbacks, r=jdm
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5850)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/bindings/codegen/CodegenRust.py')
| -rw-r--r-- | components/script/dom/bindings/codegen/CodegenRust.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index 3748917038f..7100a8c6f82 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -4918,9 +4918,6 @@ class CGCallback(CGClass): args.append(Argument("ExceptionHandling", "aExceptionHandling", "ReportExceptions")) - args[0] = Argument(args[0].argType, args[0].name, args[0].default) - method.args[2] = args[0] - # And now insert our template argument. argsWithoutThis = list(args) args.insert(0, Argument("JSRef<T>", "thisObj")) @@ -5235,7 +5232,7 @@ class CallbackMethod(CallbackMember): replacements["argv"] = "argv.as_mut_ptr()" replacements["argc"] = "argc" else: - replacements["argv"] = "nullptr" + replacements["argv"] = "ptr::null_mut()" replacements["argc"] = "0" return string.Template("${getCallable}" "let ok = unsafe {\n" |