Skip to content

meta: Add a root Cargo.lock file#1100

Merged
tgross35 merged 3 commits intorust-lang:mainfrom
tgross35:cargo-lock
Feb 16, 2026
Merged

meta: Add a root Cargo.lock file#1100
tgross35 merged 3 commits intorust-lang:mainfrom
tgross35:cargo-lock

Conversation

@tgross35
Copy link
Contributor

@tgross35 tgross35 commented Feb 16, 2026

In order to improve upon some inconsistencies seen across CI runs and locally, add a Cargo.lock file for the main workspace.

ci: test-libm

@rustbot
Copy link
Collaborator

rustbot commented Feb 16, 2026

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@tgross35 tgross35 enabled auto-merge (rebase) February 16, 2026 08:44
@bjorn3
Copy link
Member

bjorn3 commented Feb 16, 2026

If you do this, you will also have to exclude compiler-builtins from the library workspace in the rust repo. A crate may only be in one workspace at a time.

@tgross35 tgross35 disabled auto-merge February 16, 2026 08:52
@tgross35
Copy link
Contributor Author

There isn't any overlap currently; the compiler builtins Cargo.toml is duplicated, one for use in r-l/r and one for use here. That's because of the core dep, not this though

# NOTE: Must be kept in sync with `../compiler-builtins/Cargo.toml`.
#
# The manifest at `../compiler-builtins` is what actually gets used in the
# rust-lang/rust tree; however, we can't build it out of tree because it
# depends on `core` by path, and even optional Cargo dependencies need to be
# available at build time. So, we work around this by having this "shim"
# manifest that is identical except for the `core` dependency and forwards
# to the same sources, which acts as the `compiler-builtins` Cargo entrypoint
# for out of tree testing
#
# Ideally we can eventually replace this with a patch in the workspace
# manifest <https://github.com/rust-lang/cargo/issues/4648>.
.

In order to improve upon some inconsistencies seen across CI runs and
locally, add a Cargo.lock file for the main workspace.
@tgross35 tgross35 force-pushed the cargo-lock branch 2 times, most recently from 7aeb1cb to 117b295 Compare February 16, 2026 09:25
PRs are now getting the following:

    Traceback (most recent call last):
      File "/home/runner/work/compiler-builtins/compiler-builtins/ci/ci-util.py", line 510, in <module>
        main()
      File "/home/runner/work/compiler-builtins/compiler-builtins/ci/ci-util.py", line 496, in main
        ctx.emit_workflow_output()
      File "/home/runner/work/compiler-builtins/compiler-builtins/ci/ci-util.py", line 294, in emit_workflow_output
        pr = PrInfo.from_env()
             ^^^^^^^^^^^^^^^^^
      File "/home/runner/work/compiler-builtins/compiler-builtins/ci/ci-util.py", line 152, in from_env
        return cls.from_pr(pr_env)
               ^^^^^^^^^^^^^^^^^^^
      File "/home/runner/work/compiler-builtins/compiler-builtins/ci/ci-util.py", line 174, in from_pr
        return cls(**json.loads(pr_info), cfg=PrCfg(pr_json["body"]))
                                              ^^^^^^^^^^^^^^^^^^^^^^
      File "/home/runner/work/compiler-builtins/compiler-builtins/ci/ci-util.py", line 134, in __init__
        pprint.pp(self)
      File "/usr/lib/python3.12/pprint.py", line 66, in pp
        pprint(object, *args, sort_dicts=sort_dicts, **kwargs)
    ...
    AttributeError: 'PrCfg' object has no attribute 'extra_extensive'. Did you mean: 'skip_extensive'?

Resolve this by using `__post_init__` rather than `__init__`.

Fixes: bba024d ("ci: Allow specifying extra extensive tests to run")
@tgross35 tgross35 enabled auto-merge (rebase) February 16, 2026 09:33
@tgross35 tgross35 disabled auto-merge February 16, 2026 09:34
As of indicatif 0.18.4, this option must be enabled in able to build.
@tgross35 tgross35 enabled auto-merge (rebase) February 16, 2026 09:41
@tgross35 tgross35 merged commit 4659690 into rust-lang:main Feb 16, 2026
40 checks passed
@tgross35 tgross35 deleted the cargo-lock branch February 16, 2026 10:16
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.

3 participants