Skip to content

Commit 8f7a3c3

Browse files
authored
Merge pull request #231 from rust-lang/nikomatsakis-spec-update
Updates to the "adopt FLS" goal from the spec meeting
2 parents c605bbb + 52715bb commit 8f7a3c3

File tree

1 file changed

+16
-34
lines changed

1 file changed

+16
-34
lines changed

src/2025h1/spec-fls-integration.md

Lines changed: 16 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# Integration of the FLS into the Rust Project
1+
# Publish first rust-lang-owned release of "FLS"
22

3-
| Metadata | |
4-
|------------------|----------------------|
5-
| Point of contact | @joelmarcey |
6-
| Teams | <!-- TEAMS WITH ASKS --> |
7-
| Task owners | <!-- TASK OWNERS --> |
8-
| Status | Proposed |
9-
| Zulip channel | [#t-spec][channel] |
3+
| Metadata | |
4+
|------------------|--------------------------|
5+
| Point of contact | @joelmarcey |
6+
| Teams | <!-- TEAMS WITH ASKS --> |
7+
| Task owners | <!-- TASK OWNERS --> |
8+
| Status | Proposed |
9+
| Zulip channel | [#t-spec][channel] |
1010

1111
[channel]: https://rust-lang.zulipchat.com/#narrow/channel/399173-t-spec
1212

@@ -29,7 +29,7 @@ Based on more recent discussions and agreements with Ferrous Systems, the Specif
2929

3030
### The next 6 months
3131

32-
In order to properly integrate the Ferrocene Language Specification, presumably under a different name, the specification team will need to adopt processes surrounding modification, editing, review, and release of the document.
32+
The goal is to merge the Ferrocene Language Specification (FLS) into the rust-lang infrastructure and publish at least one version in some form under some (TBD) name. The expectation is that it will be integrated into our release process in a similar fashion as other rust-lang maintained books (the reference, rust book, etc) but because the FLS uses distinct tooling that may or may not be possible.
3333

3434
### The "shiny future" we are working towards
3535

@@ -52,31 +52,13 @@ The following [design axioms][da] apply:
5252

5353
Some subgoals list an expected due/completion date. If one is omitted, compeletion by the end of 2025h1 is implied.
5454

55-
| Task | Owner(s) or team(s) | Notes |
56-
|---------------|---------------------|---------------------------------------------------------------------|
57-
| Miscellaneous | ![Team][] [spec] | Take ownership of the FLS (prior to, or shortly into January 2025). |
58-
59-
### Integrate FLS into T-spec processes
60-
61-
| Task | Owner(s) or team(s) | Notes |
62-
|--------------------------------------------------|---------------------|-------------------------|
63-
| Review Existing Editorial Standards in the FLS | | End of January 2025 |
64-
| Review Tooling used by the FLS | Joel Marcey | End of January 2025 |
65-
| Author Proposal for specifics of FLS integration | Connor Horman | Mid-Late Februrary 2025 |
66-
| RFC decision | ![Team][] [spec] | End of March 2025 |
67-
| Adjust Tooling, as needed | Connor Horman | April 2025 |
68-
| Begin implementing the integration Proposal | Connor Horman | |
69-
70-
### Integrate FLS into release process
71-
72-
| Task | Owner(s) or team(s) | Notes |
73-
|---------------------------------------------------|---------------------|----------------|
74-
| Discussion and moral support | ![Team][] [release] | Februrary 2025 |
75-
| Link tooling used with FLS to the release process | | April 2025 |
76-
| Review of FLS prior to release | | May 2025 |
77-
| Get FLS into a Rust Release | | Rust 1.89 |
78-
| Standard reviews | ![Team][] [release] | |
79-
55+
| Task | Owner(s) or team(s) | Notes |
56+
|------------------------------------|--------------------------------|---------------------------------|
57+
| Discussion and moral support | ![Team][] [release][] [spec][] | |
58+
| Copyright cleanup and assignment | @JoelMarcey | End of January 2025 |
59+
| Adjust tooling, as needed | @JoelMarcey | Joel to find appropriate person |
60+
| Standard reviews | ![Team][] [release][] | For the tooling integration |
61+
| Continued updates for new releases | Ferrous Systems | |
8062

8163
## Frequently asked questions
8264

0 commit comments

Comments
 (0)