Skip to content

No Bug - Revert "Bug 42725: Fix upstream lint issues"

Merge Info

Related Issues

  • tor-browser#xxxxx
  • mullvad-browser#xxxxx
  • tor-browser-build#xxxxx

Backporting

Timeline

  • Immediate: patchset needed as soon as possible
  • Next Minor Stable Release: patchset that needs to be verified in nightly before backport
  • Eventually: patchset that needs to be verified in alpha before backport
  • No Backport (preferred): patchset for the next major stable

Merging

  • Merge to tor-browser - !fixups to tor-browser-specific commits, new features, security backports
  • Merge to base-browser - !fixups to base-browser-specific commits, new features to be shared with mullvad-browser, and security backports
    • NOTE: if your changeset includes patches to both base-browser and tor-browser please clearly label in the change description which commits should be cherry-picked to base-browser after merging

Issue Tracking

Review

Change Description

I am not really sure what happened here. I am guessing since in my "fix lints" MR I was applying the linters while the tree was in a partial state, there were some false lint issues that arose. Anyways, turns out the "upstream lint issues" we found in that MR were not really issues.

I wondered how the linter pipeline in the default branch was not failing because of these incorrectly formatted things, but turns out those misformattings were only triggering warnings, not errors. See: https://gitlab.torproject.org/tpo/applications/tor-browser/-/jobs/619414, it states there were 7 warnings.

How Tested

To test this change, we need to check that there are 0 warnings in the clang-format run for this MR.

Merge request reports