Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Synchronize with the monorepo #448

Merged
merged 2 commits into from
Oct 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CONTRIBUTING.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.. SPDX-License-Identifier: MIT OR Apache-2.0
SPDX-FileCopyrightText: Ferrous Systems and AdaCore
SPDX-FileCopyrightText: The Ferrocene Developers

====================================================
Contributing to the Ferrocene Language Specification
Expand Down
13 changes: 5 additions & 8 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.. SPDX-License-Identifier: MIT OR Apache-2.0
SPDX-FileCopyrightText: Ferrous Systems and AdaCore
SPDX-FileCopyrightText: The Ferrocene Developers

================================
Ferrocene Language Specification
Expand All @@ -11,11 +11,10 @@ Ferrocene Language Specification
specification &raquo;</a></p>

The Ferrocene Language Specification (FLS) is a document describing the Rust
language. It was created by a joint effort between `Ferrous Systems`_ and
`AdaCore`_ as one of the prerequisites for qualifying `Ferrocene`_, a Rust
toolchain qualified for safety-critical environments. The FLS is compiled of
existing Rust documentation, but presented with a rigorous structure in order
to meet the requirements of qualification.
language. It was created as one of the prerequisites for qualifying
`Ferrocene`_, a Rust toolchain qualified for safety-critical environments. The
FLS is compiled of existing Rust documentation, but presented with a rigorous
structure in order to meet the requirements of qualification.

The FLS is not intended to be used as the normative specification of the Rust
language nor is it's meant to replace the decision-making processes of the Rust
Expand All @@ -27,8 +26,6 @@ or ``Apache-2.0`` licenses, at your option. Individual files might have
different licensing. Licensing metadata is present in each file, and the full
licenses text is present in the ``LICENSES/`` directory.

.. _Ferrous Systems: https://ferrous-systems.com
.. _AdaCore: https://adacore.com
.. _Ferrocene: https://ferrocene.dev

Building the specification
Expand Down
2 changes: 1 addition & 1 deletion bors.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: MIT OR Apache-2.0
# SPDX-FileCopyrightText: Ferrous Systems and AdaCore
# SPDX-FileCopyrightText: The Ferrocene Developers

# Gate PRs on the GitHub Actions job "CI"
status = ["CI"]
Expand Down
2 changes: 1 addition & 1 deletion exts/ferrocene_spec/README.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.. SPDX-License-Identifier: MIT OR Apache-2.0
SPDX-FileCopyrightText: Ferrous Systems and AdaCore
SPDX-FileCopyrightText: The Ferrocene Developers

====================
FLS Sphinx Extension
Expand Down
2 changes: 1 addition & 1 deletion exts/ferrocene_spec/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: MIT OR Apache-2.0
# SPDX-FileCopyrightText: Ferrous Systems and AdaCore
# SPDX-FileCopyrightText: The Ferrocene Developers

from . import definitions, informational, syntax_directive, std_role, paragraph_ids
from . import items_with_rubric
Expand Down
2 changes: 1 addition & 1 deletion exts/ferrocene_spec/definitions/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: MIT OR Apache-2.0
# SPDX-FileCopyrightText: Ferrous Systems and AdaCore
# SPDX-FileCopyrightText: The Ferrocene Developers

from . import paragraphs, syntax, terms, code_terms
from docutils import nodes
Expand Down
2 changes: 1 addition & 1 deletion exts/ferrocene_spec/definitions/code_terms.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: MIT OR Apache-2.0
# SPDX-FileCopyrightText: Ferrous Systems and AdaCore
# SPDX-FileCopyrightText: The Ferrocene Developers

from docutils import nodes

Expand Down
2 changes: 1 addition & 1 deletion exts/ferrocene_spec/definitions/paragraphs.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: MIT OR Apache-2.0
# SPDX-FileCopyrightText: Ferrous Systems and AdaCore
# SPDX-FileCopyrightText: The Ferrocene Developers

from .. import utils
from collections import defaultdict
Expand Down
2 changes: 1 addition & 1 deletion exts/ferrocene_spec/definitions/syntax.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: MIT OR Apache-2.0
# SPDX-FileCopyrightText: Ferrous Systems and AdaCore
# SPDX-FileCopyrightText: The Ferrocene Developers

from docutils import nodes

Expand Down
2 changes: 1 addition & 1 deletion exts/ferrocene_spec/definitions/terms.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: MIT OR Apache-2.0
# SPDX-FileCopyrightText: Ferrous Systems and AdaCore
# SPDX-FileCopyrightText: The Ferrocene Developers

from docutils import nodes

Expand Down
2 changes: 1 addition & 1 deletion exts/ferrocene_spec/informational.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: MIT OR Apache-2.0
# SPDX-FileCopyrightText: Ferrous Systems and AdaCore
# SPDX-FileCopyrightText: The Ferrocene Developers

from . import utils
from collections import defaultdict
Expand Down
2 changes: 1 addition & 1 deletion exts/ferrocene_spec/items_with_rubric.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: MIT OR Apache-2.0
# SPDX-FileCopyrightText: Ferrous Systems and AdaCore
# SPDX-FileCopyrightText: The Ferrocene Developers

from collections import defaultdict
from dataclasses import dataclass
Expand Down
2 changes: 1 addition & 1 deletion exts/ferrocene_spec/paragraph_ids.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: MIT OR Apache-2.0
# SPDX-FileCopyrightText: Ferrous Systems and AdaCore
# SPDX-FileCopyrightText: The Ferrocene Developers

from . import definitions, informational, utils
from collections import defaultdict
Expand Down
2 changes: 1 addition & 1 deletion exts/ferrocene_spec/std_role.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: MIT OR Apache-2.0
# SPDX-FileCopyrightText: Ferrous Systems and AdaCore
# SPDX-FileCopyrightText: The Ferrocene Developers

from docutils import nodes
from sphinx.roles import SphinxRole
Expand Down
2 changes: 1 addition & 1 deletion exts/ferrocene_spec/syntax_directive.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: MIT OR Apache-2.0
# SPDX-FileCopyrightText: Ferrous Systems and AdaCore
# SPDX-FileCopyrightText: The Ferrocene Developers

from .definitions import DefIdNode, DefRefNode
from docutils import nodes
Expand Down
2 changes: 1 addition & 1 deletion exts/ferrocene_spec/utils.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: MIT OR Apache-2.0
# SPDX-FileCopyrightText: Ferrous Systems and AdaCore
# SPDX-FileCopyrightText: The Ferrocene Developers

from docutils import nodes

Expand Down
2 changes: 1 addition & 1 deletion exts/ferrocene_spec_lints/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: MIT OR Apache-2.0
# SPDX-FileCopyrightText: Ferrous Systems and AdaCore
# SPDX-FileCopyrightText: The Ferrocene Developers

import sphinx
import typing
Expand Down
2 changes: 1 addition & 1 deletion exts/ferrocene_spec_lints/alphabetical_section_titles.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: MIT OR Apache-2.0
# SPDX-FileCopyrightText: Ferrous Systems and AdaCore
# SPDX-FileCopyrightText: The Ferrocene Developers

import re
from docutils import nodes
Expand Down
2 changes: 1 addition & 1 deletion exts/ferrocene_spec_lints/require_paragraph_ids.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: MIT OR Apache-2.0
# SPDX-FileCopyrightText: Ferrous Systems and AdaCore
# SPDX-FileCopyrightText: The Ferrocene Developers

from docutils import nodes
from ferrocene_spec.definitions import DefIdNode
Expand Down
2 changes: 1 addition & 1 deletion generate-random-ids.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
# SPDX-License-Identifier: MIT OR Apache-2.0
# SPDX-FileCopyrightText: Ferrous Systems and AdaCore
# SPDX-FileCopyrightText: The Ferrocene Developers

# Convenience script to generate a list of random paragraph IDs, ready to be
# copy-pasted as you write new paragraphs.
Expand Down
2 changes: 1 addition & 1 deletion make.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
# SPDX-License-Identifier: MIT OR Apache-2.0
# SPDX-FileCopyrightText: Ferrous Systems and AdaCore
# SPDX-FileCopyrightText: The Ferrocene Developers

import os
import subprocess
Expand Down
2 changes: 1 addition & 1 deletion src/associated-items.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.. SPDX-License-Identifier: MIT OR Apache-2.0
SPDX-FileCopyrightText: Ferrous Systems and AdaCore
SPDX-FileCopyrightText: The Ferrocene Developers

.. default-domain:: spec

Expand Down
2 changes: 1 addition & 1 deletion src/attributes.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.. SPDX-License-Identifier: MIT OR Apache-2.0
SPDX-FileCopyrightText: Ferrous Systems and AdaCore
SPDX-FileCopyrightText: The Ferrocene Developers

.. default-domain:: spec

Expand Down
2 changes: 1 addition & 1 deletion src/concurrency.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.. SPDX-License-Identifier: MIT OR Apache-2.0
SPDX-FileCopyrightText: Ferrous Systems and AdaCore
SPDX-FileCopyrightText: The Ferrocene Developers

.. default-domain:: spec

Expand Down
11 changes: 5 additions & 6 deletions src/conf.py
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
# SPDX-License-Identifier: MIT OR Apache-2.0
# SPDX-FileCopyrightText: Ferrous Systems and AdaCore
# SPDX-FileCopyrightText: The Ferrocene Developers

# -- Path setup --------------------------------------------------------------

import os
import sys

sys.path.insert(0, os.path.abspath("../exts"))
sys.path.insert(1, os.path.abspath("../shared/exts"))
sys.path.append(os.path.abspath("../exts"))
sys.path.append(os.path.abspath("../shared/exts"))


# -- Project information -----------------------------------------------------

project = "Ferrocene Language Specification"
copyright = "Ferrous Systems and AdaCore"
author = "Ferrous Systems and AdaCore"
copyright = "The Ferrocene Developers"
author = "The Ferrocene Developers"


# -- General configuration ---------------------------------------------------
Expand All @@ -36,7 +36,6 @@
# This pattern also affects html_static_path and html_extra_path.
exclude_patterns = []


# -- Options for HTML output -------------------------------------------------

# The theme to use for HTML and HTML Help pages. See the documentation for
Expand Down
2 changes: 1 addition & 1 deletion src/entities-and-resolution.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.. SPDX-License-Identifier: MIT OR Apache-2.0
SPDX-FileCopyrightText: Critical Section GmbH
SPDX-FileCopyrightText: The Ferrocene Developers

.. default-domain:: spec

Expand Down
2 changes: 1 addition & 1 deletion src/exceptions-and-errors.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.. SPDX-License-Identifier: MIT OR Apache-2.0
SPDX-FileCopyrightText: Ferrous Systems and AdaCore
SPDX-FileCopyrightText: The Ferrocene Developers

.. default-domain:: spec

Expand Down
2 changes: 1 addition & 1 deletion src/expressions.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.. SPDX-License-Identifier: MIT OR Apache-2.0
SPDX-FileCopyrightText: Ferrous Systems and AdaCore
SPDX-FileCopyrightText: The Ferrocene Developers

.. default-domain:: spec

Expand Down
2 changes: 1 addition & 1 deletion src/ffi.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.. SPDX-License-Identifier: MIT OR Apache-2.0
SPDX-FileCopyrightText: Ferrous Systems and AdaCore
SPDX-FileCopyrightText: The Ferrocene Developers

.. default-domain:: spec

Expand Down
2 changes: 1 addition & 1 deletion src/functions.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.. SPDX-License-Identifier: MIT OR Apache-2.0
SPDX-FileCopyrightText: Ferrous Systems and AdaCore
SPDX-FileCopyrightText: The Ferrocene Developers

.. default-domain:: spec

Expand Down
2 changes: 1 addition & 1 deletion src/general.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.. SPDX-License-Identifier: MIT OR Apache-2.0
SPDX-FileCopyrightText: Ferrous Systems and AdaCore
SPDX-FileCopyrightText: The Ferrocene Developers

.. default-domain:: spec

Expand Down
2 changes: 1 addition & 1 deletion src/generics.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.. SPDX-License-Identifier: MIT OR Apache-2.0
SPDX-FileCopyrightText: Ferrous Systems and AdaCore
SPDX-FileCopyrightText: The Ferrocene Developers

.. default-domain:: spec

Expand Down
2 changes: 1 addition & 1 deletion src/glossary.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.. SPDX-License-Identifier: MIT OR Apache-2.0
SPDX-FileCopyrightText: Ferrous Systems and AdaCore
SPDX-FileCopyrightText: The Ferrocene Developers

.. default-domain:: spec

Expand Down
2 changes: 1 addition & 1 deletion src/implementations.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.. SPDX-License-Identifier: MIT OR Apache-2.0
SPDX-FileCopyrightText: Ferrous Systems and AdaCore
SPDX-FileCopyrightText: The Ferrocene Developers

.. default-domain:: spec

Expand Down
2 changes: 1 addition & 1 deletion src/index.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.. SPDX-License-Identifier: MIT OR Apache-2.0
SPDX-FileCopyrightText: Ferrous Systems and AdaCore
SPDX-FileCopyrightText: The Ferrocene Developers

Ferrocene Language Specification
================================
Expand Down
2 changes: 1 addition & 1 deletion src/inline-assembly.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.. SPDX-License-Identifier: MIT OR Apache-2.0
SPDX-FileCopyrightText: Critical Section GmbH
SPDX-FileCopyrightText: The Ferrocene Developers

.. default-domain:: spec

Expand Down
2 changes: 1 addition & 1 deletion src/items.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.. SPDX-License-Identifier: MIT OR Apache-2.0
SPDX-FileCopyrightText: Ferrous Systems and AdaCore
SPDX-FileCopyrightText: The Ferrocene Developers

.. default-domain:: spec

Expand Down
2 changes: 1 addition & 1 deletion src/lexical-elements.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.. SPDX-License-Identifier: MIT OR Apache-2.0
SPDX-FileCopyrightText: Ferrous Systems and AdaCore
SPDX-FileCopyrightText: The Ferrocene Developers

.. default-domain:: spec

Expand Down
2 changes: 1 addition & 1 deletion src/licenses.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.. SPDX-License-Identifier: MIT OR Apache-2.0
SPDX-FileCopyrightText: Ferrous Systems and AdaCore
SPDX-FileCopyrightText: The Ferrocene Developers

.. default-domain:: spec

Expand Down
2 changes: 1 addition & 1 deletion src/macros.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.. SPDX-License-Identifier: MIT OR Apache-2.0
SPDX-FileCopyrightText: Ferrous Systems and AdaCore
SPDX-FileCopyrightText: The Ferrocene Developers

.. default-domain:: spec

Expand Down
2 changes: 1 addition & 1 deletion src/ownership-and-deconstruction.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.. SPDX-License-Identifier: MIT OR Apache-2.0
SPDX-FileCopyrightText: Ferrous Systems and AdaCore
SPDX-FileCopyrightText: The Ferrocene Developers

.. default-domain:: spec

Expand Down
2 changes: 1 addition & 1 deletion src/patterns.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.. SPDX-License-Identifier: MIT OR Apache-2.0
SPDX-FileCopyrightText: Ferrous Systems and AdaCore
SPDX-FileCopyrightText: The Ferrocene Developers

.. default-domain:: spec

Expand Down
2 changes: 1 addition & 1 deletion src/program-structure-and-compilation.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.. SPDX-License-Identifier: MIT OR Apache-2.0
SPDX-FileCopyrightText: Ferrous Systems and AdaCore
SPDX-FileCopyrightText: The Ferrocene Developers

.. default-domain:: spec

Expand Down
2 changes: 1 addition & 1 deletion src/statements.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.. SPDX-License-Identifier: MIT OR Apache-2.0
SPDX-FileCopyrightText: Ferrous Systems and AdaCore
SPDX-FileCopyrightText: The Ferrocene Developers

.. default-domain:: spec

Expand Down
2 changes: 1 addition & 1 deletion src/types-and-traits.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.. SPDX-License-Identifier: MIT OR Apache-2.0
SPDX-FileCopyrightText: Ferrous Systems and AdaCore
SPDX-FileCopyrightText: The Ferrocene Developers

.. default-domain:: spec

Expand Down
2 changes: 1 addition & 1 deletion src/undefined-behavior.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.. SPDX-License-Identifier: MIT OR Apache-2.0
SPDX-FileCopyrightText: Critical Section GmbH
SPDX-FileCopyrightText: The Ferrocene Developers

.. default-domain:: spec
.. informational-page::
Expand Down
2 changes: 1 addition & 1 deletion src/unsafety.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.. SPDX-License-Identifier: MIT OR Apache-2.0
SPDX-FileCopyrightText: Ferrous Systems and AdaCore
SPDX-FileCopyrightText: The Ferrocene Developers

.. default-domain:: spec

Expand Down
2 changes: 1 addition & 1 deletion src/values.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.. SPDX-License-Identifier: MIT OR Apache-2.0
SPDX-FileCopyrightText: Ferrous Systems and AdaCore
SPDX-FileCopyrightText: The Ferrocene Developers

.. default-domain:: spec

Expand Down