Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

crown: Pass --cfg crown to rustc from crown (#35073)

Browse source 
* crown: Pass `--cfg crown` to rustc from crown

also includes minor fix in crown for wrapper running based on clippy code

Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>

* fix doc

Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>

* Update python/servo/command_base.py

Co-authored-by: Martin Robinson <mrobinson@igalia.com>
Signed-off-by: Samson <16504129+sagudev@users.noreply.github.com>

---------

Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>
Signed-off-by: Samson <16504129+sagudev@users.noreply.github.com>
Co-authored-by: Martin Robinson <mrobinson@igalia.com>
This commit is contained in:
Samson 2025-01-31 19:08:04 +01:00 • committed by GitHub
parent 22867c5046
commit 724f701f79
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 26 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
python/servo/command_base.py
View file

@ -807,14 +807,12 @@ class CommandBase(object):
f'already set to `{current_rustc}` in the parent environment.\n'
'These options conflict, please specify only one of them.')
sys.exit(1)
features += ["crown"]
env['CARGO_BUILD_RUSTC'] = 'crown'
# Changing `RUSTC` or `CARGO_BUILD_RUSTC` does not cause `cargo check` to
# recheck files with the new compiler. `cargo build` is not affected and
# triggers a rebuild as expected. To also make `check` work as expected,
# we add a dummy `cfg` to RUSTFLAGS when using crown, so as to have different
# RUSTFLAGS when using `crown`, to reliably trigger re-checking.
env['RUSTFLAGS'] = env.get('RUSTFLAGS', "") + " --cfg=crown"
# Modyfing `RUSTC` or `CARGO_BUILD_RUSTC` to use a linter does not cause
# `cargo check` to rebuild. To work around this bug use a `crown` feature
# to invalidate caches and force a rebuild / relint.
# See https://github.com/servo/servo/issues/35072#issuecomment-2600749483
features += ["crown"]
if "-p" not in cargo_args: # We're building specific package, that may not have features
features += list(self.features)