Skip to content

Fix alignment mismatch warning #754

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jschwe wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −17
Open

Fix alignment mismatch warning #754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mozjs-sys/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "mozjs_sys"
description = "System crate for the Mozilla SpiderMonkey JavaScript engine."
repository.workspace = true
version = "140.11.0-0"
version = "140.11.0-1"
authors = ["Mozilla", "The Servo Project Developers"]
links = "mozjs"
license.workspace = true
Expand Down
13 changes: 0 additions & 13 deletions mozjs-sys/etc/patches/0024-bindgen-fixes.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,16 +69,3 @@ index 9d1df4664..86646e13d 100644
const char* data_;

public:
diff --git a/js/public/ColumnNumber.h b/js/public/ColumnNumber.h
index 9fd007f4b..adfce9dd2 100644
--- a/js/public/ColumnNumber.h
+++ b/js/public/ColumnNumber.h
@@ -304,7 +304,7 @@ struct LimitedColumnNumberOneOrigin : public detail::MaybeLimitedColumnNumber<
};

// Column number in 1-origin.
-struct ColumnNumberOneOrigin : public detail::MaybeLimitedColumnNumber<0> {
+struct __attribute__((__packed__)) ColumnNumberOneOrigin : public detail::MaybeLimitedColumnNumber<0> {
private:
using Base = detail::MaybeLimitedColumnNumber<0>;

2 changes: 1 addition & 1 deletion mozjs-sys/mozjs/js/public/ColumnNumber.h
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions mozjs/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "mozjs"
description = "Rust bindings to the Mozilla SpiderMonkey JavaScript engine."
repository.workspace = true
version = "0.16.1"
version = "0.16.2"
authors = ["The Servo Project Developers"]
license.workspace = true
edition.workspace = true
Expand All @@ -27,7 +27,7 @@ encoding_rs = "0.8.35"
libc.workspace = true
log = "0.4"
# When doing non-version changes also update ../mozjs-sys/etc/sm-security-bump.py
mozjs_sys = { version = "=140.11.0-0", path = "../mozjs-sys" }
mozjs_sys = { version = "=140.11.0-1", path = "../mozjs-sys" }
num-traits = "0.2"

[target.'cfg(target_arch = "wasm32")'.dev-dependencies]
Expand Down
Loading