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

Remove a workaround for a bug #122186

Closed
wants to merge 1 commit into from

Conversation

bjorn3
Copy link
Member

@bjorn3 bjorn3 commented Mar 8, 2024

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

@bjorn3 bjorn3 added the A-metadata Area: Crate metadata label Mar 8, 2024
@rustbot
Copy link
Collaborator

rustbot commented Mar 8, 2024

r? @oli-obk

rustbot has assigned @oli-obk.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Mar 8, 2024
@rust-log-analyzer

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.
@bjorn3
Copy link
Member Author

bjorn3 commented Mar 8, 2024

r? @petrochenkov

@rustbot rustbot assigned petrochenkov and unassigned oli-obk Mar 8, 2024
@petrochenkov
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Mar 8, 2024

📌 Commit 446708b has been approved by petrochenkov

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 8, 2024
jhpratt added a commit to jhpratt/rust that referenced this pull request Mar 9, 2024
…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
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 9, 2024
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
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 9, 2024
…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
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 9, 2024
…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
@matthiaskrgr
Copy link
Member

@bors rollup=iffy
I wonder if this causes the failure in #122236 (comment)

@erikdesjardins
Copy link
Contributor

erikdesjardins commented Mar 9, 2024

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.

   ---- library/core/src/primitive_docs.rs - prim_pointer (line 539) stdout ----
  error[E0464]: multiple candidates for `rmeta` dependency `libc` found
  Error:  --> library/core/src/primitive_docs.rs:542:1
    |
  6 | extern crate libc;
    | ^^^^^^^^^^^^^^^^^^
    |
    = note: candidate #1: /checkout/obj/build/tmp/distcheck/build/x86_64-unknown-linux-gnu/stage1/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblibc-7d0ebf382fa70bdc.rmeta
    = note: candidate #2: /checkout/obj/build/tmp/distcheck/build/x86_64-unknown-linux-gnu/stage1/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblibc-d0cdd8731e50da55.rlib
  
  error: aborting due to 1 previous error
  
  For more information about this error, try `rustc --explain E0464`.
  Couldn't compile the test.
  
  failures:
      library/core/src/primitive_docs.rs - prim_pointer (line 539)

@bjorn3
Copy link
Member Author

bjorn3 commented Mar 10, 2024

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.

@erikdesjardins
Copy link
Contributor

The comment describes itself as a super gross hack, it's probably inaccurate 😁

At this point, all of the PRs which are common to #122229 and #122236 have landed separately except this one, so the hack does appear to be load-bearing in some way.

@bors
Copy link
Contributor

bors commented Mar 10, 2024

⌛ Testing commit 446708b with merge 414fe8b...

bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 10, 2024
…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
@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)

@bors
Copy link
Contributor

bors commented Mar 10, 2024

💔 Test failed - checks-actions

@bors bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 10, 2024
@bors bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 10, 2024
@petrochenkov petrochenkov 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-review Status: Awaiting review from the assignee but also interested parties. labels Mar 10, 2024
@RalfJung
Copy link
Member

@bors r-
(bors sync fixup)

@bjorn3 bjorn3 closed this Jul 7, 2024
@bjorn3 bjorn3 deleted the remove_bug_workaround branch July 7, 2024 17:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-metadata Area: Crate metadata S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants