Changes to be committed:

	modified:   src/python/pants/bin/engine_initializer.py
	modified:   src/python/pants/engine/BUILD
	modified:   src/python/pants/engine/build_files.py
	modified:   src/python/pants/engine/legacy/address_mapper.py
	modified:   src/python/pants/engine/legacy/graph.py
	modified:   src/python/pants/engine/legacy/source_mapper.py
	modified:   src/python/pants/engine/mapper.py
	modified:   src/python/pants/engine/native.py
	modified:   src/python/pants/engine/scheduler.py
	modified:   src/python/pants/engine/selectors.py
	modified:   src/python/pants/scm/change_calculator.py
	modified:   src/rust/engine/src/lib.rs
	modified:   src/rust/engine/src/selectors.rs
	modified:   tests/python/pants_test/build_graph/test_build_graph_integration.py
	modified:   tests/python/pants_test/engine/BUILD
	modified:   tests/python/pants_test/engine/legacy/test_graph.py
	modified:   tests/python/pants_test/engine/legacy/test_list_integration.py
	modified:   tests/python/pants_test/engine/test_engine.py
	modified:   tests/python/pants_test/engine/test_mapper.py
	modified:   tests/python/pants_test/engine/test_rules.py
	modified:   tests/python/pants_test/engine/test_scheduler.py
	modified:   tests/python/pants_test/option/util/fakes.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   src/rust/engine/src/nodes.rs
	both modified:   src/rust/engine/src/rule_graph.rs
	both modified:   src/rust/engine/src/tasks.rs

[tw-mbp-yic pants (1.5.x|CHERRY-PICKING)]$