Skip to content

Update miri #98927

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

Closed
wants to merge 1 commit into from
Closed

Update miri #98927

wants to merge 1 commit into from

Conversation

oli-obk
Copy link
Contributor

@oli-obk oli-obk commented Jul 5, 2022

fixes #98922

r? @ghost

cc @rust-lang/miri

Verified

This commit was signed with the committer’s verified signature.
Gumichocopengin8 Keita Nonaka
@rustbot
Copy link
Collaborator

rustbot commented Jul 5, 2022

The Miri submodule was changed

cc @rust-lang/miri

@oli-obk
Copy link
Contributor Author

oli-obk commented Jul 5, 2022

@bors r+ p=1 submodule update

@bors
Copy link
Collaborator

bors commented Jul 5, 2022

📌 Commit d77ff8e has been approved by oli-obk

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 5, 2022
@rust-log-analyzer
Copy link
Collaborator

The job x86_64-gnu-tools failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
  IMAGE: x86_64-gnu-tools
##[endgroup]
From https://github.com/rust-lang/rust
 * branch              master     -> FETCH_HEAD
Searching for toolstate changes between 4045ce641a9eede71cc12031a2cd71692b273890 and 9a4aac0bc9a230f5c0ba6305f222a22ec2f6f4b9
Submodules were updated
##[group]Run src/ci/scripts/verify-channel.sh
src/ci/scripts/verify-channel.sh
shell: /usr/bin/bash --noprofile --norc -e -o pipefail {0}
env:
---
   Compiling openssl v0.10.38
   Compiling rustc-workspace-hack v1.0.0 (/checkout/src/tools/rustc-workspace-hack)
   Compiling miri v0.1.0 (/checkout/src/tools/miri)
    Finished release [optimized] target(s) in 1m 53s
duplicate artifacts found when compiling a tool, this typically means that something was recompiled because a transitive dependency has different features activated than in a previous build:

the following dependencies are duplicated although they have the same features enabled:
the following dependencies have different features:
  regex-syntax 0.6.25 (registry+https://github.com/rust-lang/crates.io-index)
    `miri` additionally enabled features {} at "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libregex_syntax-58cfc058958766c7.rlib"
    `clippy-driver` additionally enabled features {"unicode-case", "unicode-perl", "default", "unicode", "unicode-bool", "unicode-segment", "unicode-script", "unicode-gencat", "unicode-age"} at "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libregex_syntax-85b94989e8115749.rlib"
  regex 1.5.5 (registry+https://github.com/rust-lang/crates.io-index)
    `miri` additionally enabled features {} at "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libregex-4d78bd3efd208579.rlib"
    `rls` additionally enabled features {"unicode-case", "unicode-script", "unicode-segment", "unicode-gencat", "unicode", "default", "unicode-bool", "unicode-age", "unicode-perl"} at "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libregex-7d13fa063f867ef0.rlib"

to fix this you will probably want to edit the local src/tools/rustc-workspace-hack/Cargo.toml crate, as that will update the dependency graph to ensure that these crates all share the same feature set
thread 'main' panicked at 'tools should not compile multiple copies of the same crate', tool.rs:197:13
Build completed unsuccessfully in 0:28:18
{"embedded-book":"test-pass","reference":"test-pass","rls":"test-pass","edition-guide":"test-pass","nomicon":"test-pass","rustbook":"test-fail","book":"test-pass","rust-by-example":"test-pass"}Building rustbuild
    Finished dev [unoptimized] target(s) in 0.07s
    Finished dev [unoptimized] target(s) in 0.07s
error: Tool `miri` was not recorded in tool state.

@RalfJung
Copy link
Member

RalfJung commented Jul 5, 2022

@bors r-

There are some Miri PRs in flight that it would be good to include. :) In particular rust-lang/miri#2323.
Also, there are some more breaking changes (soon to be) queued up in Bors so not sure if it's worth it right now.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 5, 2022
@oli-obk oli-obk closed this Jul 5, 2022
@oli-obk oli-obk deleted the miriup branch July 5, 2022 13:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

miri no longer builds after rust-lang/rust#98910
5 participants