-
Notifications
You must be signed in to change notification settings - Fork 12.8k
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
Remove a workaround for a bug #122186
Remove a workaround for a bug #122186
Conversation
This comment has been minimized.
This comment has been minimized.
I don't think it is necessary anymore. As I understand it from issue 39504 the original problem was that rustbuild changed a hardlink in the cargo build dir to point to copy in the sysroot while cargo may have hardlinked it to the original first. I don't think this happens anymore and as such this workaround is no longer necessary.
fc9409b
to
446708b
Compare
@bors r+ |
…trochenkov Remove a workaround for a bug I don't think it is necessary anymore. As I understand it from issue 39504 the original problem was that rustbuild changed a hardlink in the cargo build dir to point to copy in the sysroot while cargo may have hardlinked it to the original first. I don't think this happens anymore and as such this workaround is no longer necessary. Split out of rust-lang#120855
Rollup of 12 pull requests Successful merges: - rust-lang#99153 (Add Read Impl for &Stdin) - rust-lang#112136 (Add std::ffi::c_str module) - rust-lang#120504 (Vec::try_with_capacity) - rust-lang#121280 (Implement MaybeUninit::fill{,_with,_from}) - rust-lang#121813 (Misc improvements to non local defs lint implementation) - rust-lang#121833 (Suggest correct path in include_bytes!) - rust-lang#121860 (Add a tidy check that checks whether the fluent slugs only appear once) - rust-lang#122160 (Eagerly translate `HelpUseLatestEdition` in parser diagnostics) - rust-lang#122178 (ci: add a runner for vanilla LLVM 18) - rust-lang#122186 (Remove a workaround for a bug) - rust-lang#122215 (Some tweaks to the parallel query cycle handler) - rust-lang#122223 (Fix typo in `VisitorResult`) r? `@ghost` `@rustbot` modify labels: rollup
…trochenkov Remove a workaround for a bug I don't think it is necessary anymore. As I understand it from issue 39504 the original problem was that rustbuild changed a hardlink in the cargo build dir to point to copy in the sysroot while cargo may have hardlinked it to the original first. I don't think this happens anymore and as such this workaround is no longer necessary. Split out of rust-lang#120855
…iaskrgr Rollup of 11 pull requests Successful merges: - rust-lang#121567 (Avoid some interning in bootstrap) - rust-lang#121813 (Misc improvements to non local defs lint implementation) - rust-lang#121860 (Add a tidy check that checks whether the fluent slugs only appear once) - rust-lang#121907 (skip sanity check for non-host targets in `check` builds) - rust-lang#122160 (Eagerly translate `HelpUseLatestEdition` in parser diagnostics) - rust-lang#122178 (ci: add a runner for vanilla LLVM 18) - rust-lang#122186 (Remove a workaround for a bug) - rust-lang#122187 (Move metadata header and version checks together) - rust-lang#122215 (Some tweaks to the parallel query cycle handler) - rust-lang#122223 (Fix typo in `VisitorResult`) - rust-lang#122232 (library/core: fix a comment, and a cfg(miri) warning) r? `@ghost` `@rustbot` modify labels: rollup
@bors rollup=iffy |
This almost certainly causes the failure in #122229/#122236, as it's the only change that touches crate loading. And the error about multiple candidates is very similar to the code comment about two candidates.
|
The code comment talks about two possible locations for identical files, while the error here is about two different versions of the same crate. So either the comment is incorrect or the error here is not caused by this PR. |
…ochenkov Remove a workaround for a bug I don't think it is necessary anymore. As I understand it from issue 39504 the original problem was that rustbuild changed a hardlink in the cargo build dir to point to copy in the sysroot while cargo may have hardlinked it to the original first. I don't think this happens anymore and as such this workaround is no longer necessary. Split out of rust-lang#120855
💔 Test failed - checks-actions |
@bors r- |
I don't think it is necessary anymore. As I understand it from issue 39504 the original problem was that rustbuild changed a hardlink in the cargo build dir to point to copy in the sysroot while cargo may have hardlinked it to the original first. I don't think this happens anymore and as such this workaround is no longer necessary.
Split out of #120855