From 3335b235780ed28da8b8249c583c2c4dd3eced70 Mon Sep 17 00:00:00 2001 From: kirtchev-adacore Date: Tue, 14 Jul 2026 11:13:20 +0300 Subject: [PATCH 1/2] [Dev-Guide]: Dealing with PR blockers --- src/dev-guide.rst | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/dev-guide.rst b/src/dev-guide.rst index b52d574e..4d5b489e 100644 --- a/src/dev-guide.rst +++ b/src/dev-guide.rst @@ -96,6 +96,30 @@ Use the following sentence pattern for multiple syntax categories:: ```` must denote either ``Changed``, ``New``, or ``Removed``. +Dealing with PR blockers +------------------------ + +Incorrect or incomplete semantics +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +While working on a PR, a developer may need to modify existing FLS semantics or terminology, only for the developer to discover that these semantics or terms are either incorrect or incomplete. +In such cases, bring up the issue to the FLS team. + +Depending on the scope of the required changes, the FLS team may decide to either: +- Enact the necessary changes in the same PR-in-development, or +- Approximate the contents of the PR-in-development, and open a GitHub issue to track the update on the semantics or terms. + +Missing semantics +~~~~~~~~~~~~~~~~~ + +While working on a PR, a developer may need to modify existing FLS semantics or use existing terminology, only for the developer to discover that these semantics or terms are missing. +This may happen when the Rust Reference or other sources the FLS team may use as reference were changed irrespective of Rust releases. +In such cases, bring up the issue to the FLS team. + +Depending on the scope of the required changes, the FLS team may decide to either: +- Enact the necessary changes in the same PR, or +- Create a separate PR to introduce the missing semantics or terms, and then update the contents of the PR-in-development. + Merge ordering -------------- From 007d2c5c6a0e7899cbff343c20eebf485502e289 Mon Sep 17 00:00:00 2001 From: kirtchev-adacore Date: Mon, 3 Aug 2026 13:51:53 +0300 Subject: [PATCH 2/2] Address feedback --- src/dev-guide.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/dev-guide.rst b/src/dev-guide.rst index 4d5b489e..db0bd419 100644 --- a/src/dev-guide.rst +++ b/src/dev-guide.rst @@ -102,17 +102,17 @@ Dealing with PR blockers Incorrect or incomplete semantics ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -While working on a PR, a developer may need to modify existing FLS semantics or terminology, only for the developer to discover that these semantics or terms are either incorrect or incomplete. +While working on a PR, a developer may discover that the PR depends on semantics or terminology that are either incorrect or incomplete in the FLS. In such cases, bring up the issue to the FLS team. Depending on the scope of the required changes, the FLS team may decide to either: - Enact the necessary changes in the same PR-in-development, or -- Approximate the contents of the PR-in-development, and open a GitHub issue to track the update on the semantics or terms. +- Defer the pre-existing out-of-scope problem only when the PR-in-development remains accurate within its stated scope, and open GitHub issue to track the problem. Missing semantics ~~~~~~~~~~~~~~~~~ -While working on a PR, a developer may need to modify existing FLS semantics or use existing terminology, only for the developer to discover that these semantics or terms are missing. +While working on a PR, a developer may discover that the PR depends on semantics or terminology that the FLS does not yet define. This may happen when the Rust Reference or other sources the FLS team may use as reference were changed irrespective of Rust releases. In such cases, bring up the issue to the FLS team.