Skip to content

s/Ferrocene Language Specification/FLS and update README#564

Merged
traviscross merged 1 commit intorust-lang:mainfrom
JoelMarcey:ferrocene-language-specification-to-fls
Jun 1, 2025
Merged

s/Ferrocene Language Specification/FLS and update README#564
traviscross merged 1 commit intorust-lang:mainfrom
JoelMarcey:ferrocene-language-specification-to-fls

Conversation

@JoelMarcey
Copy link
Copy Markdown
Contributor

This works to replace the Ferrocene Language Specification with FLS across the document until we come up with our preferred name to replace the FLS.

This includes removing the Ferrocene logo and replacing it with the Rust Project logo in the sidebar.

This also updates the README to provide appropriate credit to Ferrous and provide the history of the FLS when it was the Ferrocene Language Specification.

Comment thread README.rst Outdated
Comment thread src/glossary.rst Outdated
Comment thread src/conf.py
Comment on lines +16 to +17
copyright = "The Ferrocene Developers and The Rust Project Contributors"
author = "The Ferrocene Developers and The Rust Project Contributors"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we just want to boil this down to "The Rust Project Contributors"? At this point, given what's been done, I think we could consider the Ferrocene Developers to be Rust Project Contributors as well.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Under the agreement of the transfer, we would leave existing copyright in place and add new copyright for any changes or updates. New files we would just put "The Rust Project Contributors".

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes... I had flagged this one because it's not a header on this file, it's a configuration that will apply this everywhere, to both old things as well as new ones. My reading is that, due to the CLA and the wording of the Apache 2.0 license, which specifically defines:

"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.

that all the existing authors would be "Rust Project Contributors" and so consolidating it would be OK for this cross-project purpose, and then on each file, we'd keep the individual copyright lines as you say. But it's OK either way.

Comment thread exts/ferrocene_spec/README.rst Outdated
Comment thread README.rst Outdated
Comment thread README.rst Outdated
Comment thread README.rst Outdated
Comment thread CONTRIBUTING.rst Outdated
@traviscross
Copy link
Copy Markdown
Contributor

Thanks @JoelMarcey for the PR. Overall, this looks pretty good. I've left some notes. I'll review again when it is passing CI.

Comment thread CONTRIBUTING.rst
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This whole file is pretty much specific to Ferrocene, I don't think most of the content applies to the Rust project.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I am going to do another pass across some of these files in a separate PR.

Comment thread themes/fls/layout.html Outdated
<header>
<a href="{{ pathto('index') }}">
<img src="{{ pathto('_static/ferrocene.svg', 1) }}" alt="Ferrocene logo">
<img src="{{ pathto('_static/rust-lang.svg', 1) }}" alt="Ferrocene logo">
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: alt text still mentions Ferrocene.

Comment thread CONTRIBUTING.rst Outdated
We released the Ferrocene Language Specification (FLS) publicly under an open
source license. That's always been our goal, and since we announced our effort,
a lot of people and organizations expressed their interest in it!
The FLS is released publicly under an open source license, specifically MIT and Apache 2.0.
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is still trailing whitespace (i.e. spaces that follow the last visible character) on this line and elsewhere in this diff. Also, this line needs to be wrapped.

@traviscross traviscross force-pushed the ferrocene-language-specification-to-fls branch from 514339b to 0e295ea Compare June 1, 2025 23:23
@traviscross
Copy link
Copy Markdown
Contributor

Pushed a squashing rebase.

Comment thread README.rst Outdated
This works to replace "Ferrocene Language Specification" with "FLS"
across the document until we come up with our preferred name to
replace the FLS.

This includes removing the Ferrocene logo and replacing it with the
Rust Project logo in the sidebar.

This also updates the README to provide appropriate credit to Ferrous
Systems and provide the history of the FLS when it was the Ferrocene
Language Specification.
@traviscross traviscross force-pushed the ferrocene-language-specification-to-fls branch from 0e295ea to 8d1630c Compare June 1, 2025 23:28
@traviscross traviscross added this pull request to the merge queue Jun 1, 2025
Merged via the queue into rust-lang:main with commit 28bc1a6 Jun 1, 2025
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants