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

Combine rust libs #6408

Merged
merged 20 commits into from
Aug 16, 2020
Merged

Combine rust libs #6408

merged 20 commits into from
Aug 16, 2020

Conversation

bridiver
Copy link
Collaborator

@bridiver bridiver commented Aug 12, 2020

Resolves brave/brave-browser#6515

Submitter Checklist:

Test Plan:

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Request a security/privacy review as needed.
  • Adequate test coverage exists to prevent regressions
  • Verify test plan is specified in PR before merging to source

After-merge Checklist:

  • The associated issue milestone is set to the smallest version that the
    changes has landed on.
  • All relevant documentation has been updated.

  warning: unused variable: `origin`
    --> /Users/jenkins/jenkins/workspace/pr-brave-browser-combine-rust-libs-ios/src/brave/components/speedreader/rust/lib/src/rewriter_config_builder.rs:40:5
     |
  40 |     origin: &str,
     |     ^^^^^^ help: consider prefixing with an underscore: `_origin`
     |
     = note: `#[warn(unused_variables)]` on by default
  
     Compiling speedreader-ffi v0.1.0 (/Users/jenkins/jenkins/workspace/pr-brave-browser-combine-rust-libs-ios/src/brave/components/speedreader/rust/ffi)
     Compiling adblock-ffi v0.1.0 (/Users/jenkins/jenkins/workspace/pr-brave-browser-combine-rust-libs-ios/src/brave/vendor/adblock_rust_ffi)
Copy link
Contributor

@iefremov iefremov left a comment

Choose a reason for hiding this comment

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

Delegating to @AndriusA , I'm on PTO and can't take a look

"//base",
]

if (is_mac || is_ios ) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

nit: extra space before )

Copy link
Collaborator

@tmancey tmancey left a comment

Choose a reason for hiding this comment

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

LGTM

@bridiver
Copy link
Collaborator Author

bridiver commented Aug 16, 2020

This did pass windows at one point, but now I keep getting various errors that seem to be related to windows path length limitations

18:01:41  [0:00:44] error: unable to create file third_party/blink/web_tests/external/wpt/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/no_window_open_when_t
18:01:41  erm_nesting_level_nonzero.window-expected.txt: Filename too long
18:01:41  [0:00:44] error: unable to create file third_party/blink/web_tests/external/wpt/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/embedded-and-images-presentational-h
18:01:41  ints-ascii-case-insensitive-expected.txt: Filename too long
18:01:41  [0:00:44] error: unable to create file third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/prefer_compositing_to_lcd_text/compositing/overflow/scroll-parent-with-non-stacking-c
18:01:41  ontext-composited-ancestor-expected.txt: Filename too long
18:01:41  [0:00:44] error: unable to create file third_party/blink/web_tests/virtual/disable-user-agent-client-hint-feature/external/wpt/client-hints/accept-ch-stickiness/cross-origin-subresource-redire
18:01:41  ct-with-fp-delegation.https-expected.txt: Filename too long
18:01:41  [0:00:44] fatal: Could not reset index file to revision 'HEAD'.
18:01:41  ----------------------------------------
18:01:41  
18:01:41  Error: Command 'git reset --hard HEAD --quiet' returned non-zero exit status 128 in C:\jenkins\workspace\pr-brave-browser-combine-rust-libs-windows\src

I'm going to merge and see if the problem shows up in nightly which should have a shorter path (C:\jenkins\workspace\pr-brave-browser-combine-rust-libs-windows)

@bridiver bridiver merged commit ca4aab3 into master Aug 16, 2020
@bridiver bridiver deleted the combine-rust-libs branch August 16, 2020 01:10
@bridiver bridiver added this to the 1.14.x - Nightly milestone Aug 16, 2020
@bridiver bridiver mentioned this pull request Aug 26, 2020
32 tasks
rillian added a commit that referenced this pull request Dec 13, 2021
We were patching the rust cssparser crate to work around an issue
with `f64::powf` linking to symbols from the system glibc which
couldn't be satisfied by the sysroot the official builds link
against.

This has since been addressed by having cargo target the same
sysroot, I think by #6408,
so we can remove the diversion and use the upstream crate which
lets us update more easily and benefit from shared audits.

Resolves brave/brave-browser#20080
@rillian rillian mentioned this pull request Dec 13, 2021
25 tasks
rillian added a commit that referenced this pull request Jan 26, 2022
We were patching the rust cssparser crate to work around an issue
with `f64::powf` linking to symbols from the system glibc which
couldn't be satisfied by the sysroot the official builds link
against.

This has since been addressed by having cargo target the same
sysroot, I think by #6408,
so we can remove the diversion and use the upstream crate which
lets us update more easily and benefit from shared audits.

Resolves brave/brave-browser#20080
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.

macOS failing tests
4 participants