Skip to content
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.

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

Upgrade Flatbuffers. #1127

Merged
merged 4 commits into from
Oct 31, 2018
Merged

Upgrade Flatbuffers. #1127

merged 4 commits into from
Oct 31, 2018

Conversation

ry
Copy link
Member

@ry ry commented Oct 31, 2018

Use msg_generated.rs as mod instead of crate.

This overlaps in functionality provided by #1125...

Use msg_generated.rs as mod instead of crate.
BUILD.gn Outdated
@@ -124,8 +123,12 @@ ts_sources = [
rust_executable("deno") {
source_root = "src/main.rs"
extern = main_extern
data = [
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not a data dep.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use inputs or sources.

Copy link
Member Author

@ry ry Oct 31, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, it seems that the deno_bin.d depfile now include msg_generated.d - rust is smart enough to detect include!() it seems. I removed this.

src/msg.rs Show resolved Hide resolved
@@ -49,6 +49,7 @@ template("rust_crate") {
"crate_type",
"crate_version",
"deps",
"data",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not needed. We do not have any data deps for any rust targets.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed.

@@ -170,7 +170,7 @@ template("rust_crate") {
"rustc",
rebase_path(source_root, root_build_dir),
"--env-out-dir",
rebase_path(root_out_dir),
rebase_path(out_dir, root_out_dir),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should probably rebased with "//src" as the second arg.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or with // and add an extra .. to the include!

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

@ry ry merged commit 7c82667 into denoland:master Oct 31, 2018
@ry ry deleted the upgrade_flatbuffers branch October 31, 2018 07:32
@ry ry mentioned this pull request Oct 31, 2018
ry added a commit to ry/deno that referenced this pull request Nov 5, 2018
- Performance and stability improvements on all platforms.
- Add repl (denoland#998)
- Add deno.Buffer (denoland#1121)
- Support cargo check (denoland#1128)
- Upgrade Rust crates and Flatbuffers. (denoland#1145, denoland#1127)
- Add helper to turn deno.Reader into async iterator (denoland#1130)
- Add ability to load JSON as modules (denoland#1065)
- Add deno.resources() (denoland#1119)
- Add application/x-typescript mime type support (denoland#1111)
@ry ry mentioned this pull request Nov 5, 2018
ry added a commit that referenced this pull request Nov 5, 2018
- Performance and stability improvements on all platforms.
- Add repl (#998)
- Add deno.Buffer (#1121)
- Support cargo check (#1128)
- Upgrade Rust crates and Flatbuffers. (#1145, #1127)
- Add helper to turn deno.Reader into async iterator (#1130)
- Add ability to load JSON as modules (#1065)
- Add deno.resources() (#1119)
- Add application/x-typescript mime type support (#1111)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants