Skip to content

library: bump libc dependency #129226

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

Merged
merged 1 commit into from
Aug 20, 2024
Merged

library: bump libc dependency #129226

merged 1 commit into from
Aug 20, 2024

Conversation

RalfJung
Copy link
Member

This pulls in rust-lang/libc#3723, which hopefully unblocks rust-lang/miri#3748.

@rustbot
Copy link
Collaborator

rustbot commented Aug 18, 2024

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
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
Copy link
Collaborator

rustbot commented Aug 18, 2024

These commits modify the library/Cargo.lock file. Unintentional changes to library/Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 18, 2024
@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=iffy

@bors
Copy link
Collaborator

bors commented Aug 18, 2024

📌 Commit c487b1f has been approved by Mark-Simulacrum

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 Aug 18, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 18, 2024
library: bump libc dependency

This pulls in rust-lang/libc#3723, which hopefully unblocks rust-lang/miri#3748.
@bors
Copy link
Collaborator

bors commented Aug 18, 2024

⌛ Testing commit c487b1f with merge 93efd29...

@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Collaborator

bors commented Aug 18, 2024

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 18, 2024
@RalfJung
Copy link
Member Author

libc build on wasm32-wasip1 target seems to fail?

  error[E0599]: no method named `any` found for struct `core::slice::Iter` in the current scope
      --> /cargo/registry/src/index.crates.io-6f17d22bba15001f/libc-0.2.157/src/wasi.rs:454:38
       |
  454  |         return set.__fds[..n].iter().any(|p| *p == fd)
       |                                      ^^^ method not found in `Iter<'_, i32>`
       |
      ::: /checkout/library/core/src/iter/traits/iterator.rs:2799:8
       |
  2799 |     fn any<F>(&mut self, f: F) -> bool
       |        --- the method is available for `core::slice::Iter<'_, i32>` here
       |
       = help: items from traits can only be used if the trait is in scope
  help: trait `Iterator` which provides `any` is implemented but not in scope; perhaps you want to import it
       |
  1    + use core::iter::Iterator;
       |
  
  error[E0599]: no method named `any` found for struct `core::slice::Iter` in the current scope
      --> /cargo/registry/src/index.crates.io-6f17d22bba15001f/libc-0.2.157/src/wasi.rs:460:35
       |
  460  |         if !set.__fds[..n].iter().any(|p| *p == fd) {
       |                                   ^^^ method not found in `Iter<'_, i32>`
       |
      ::: /checkout/library/core/src/iter/traits/iterator.rs:2799:8
       |
  2799 |     fn any<F>(&mut self, f: F) -> bool
       |        --- the method is available for `core::slice::Iter<'_, i32>` here
       |
       = help: items from traits can only be used if the trait is in scope
  help: trait `Iterator` which provides `any` is implemented but not in scope; perhaps you want to import it
       |
  1    + use core::iter::Iterator;
       |

Cc @tgross35 @JohnTitor

@tgross35
Copy link
Contributor

That had to come from rust-lang/libc#3681, presumably because we don't test with rustc-dep-of-std that doesn't get the prelude. I'll ask for a fix on that PR.

@tgross35
Copy link
Contributor

Released 0.2.158 with what should be a fix for this.

@RalfJung
Copy link
Member Author

Thanks! Let's see if that works.
@bors r=Mark-Simulacrum

@bors
Copy link
Collaborator

bors commented Aug 19, 2024

📌 Commit 5365b05 has been approved by Mark-Simulacrum

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 Aug 19, 2024
@bors
Copy link
Collaborator

bors commented Aug 19, 2024

⌛ Testing commit 5365b05 with merge 5fdc807...

bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 19, 2024
library: bump libc dependency

This pulls in rust-lang/libc#3723, which hopefully unblocks rust-lang/miri#3748.
@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)
[RUSTC-TIMING] miri test:false 4.453
error: failed to remove file `C:\a\rust\rust\build\x86_64-pc-windows-msvc\stage1-tools\x86_64-pc-windows-msvc\release\miri.exe`

Caused by:
  Access is denied. (os error 5)
Command has failed. Rerun with -v to see more details.
  local time: Mon, Aug 19, 2024  4:29:24 PM
  network time: Mon, 19 Aug 2024 16:29:25 GMT
##[error]Process completed with exit code 1.
Post job cleanup.

@bors
Copy link
Collaborator

bors commented Aug 19, 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 Aug 19, 2024
@bors bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 19, 2024
@RalfJung
Copy link
Member Author

RalfJung commented Aug 19, 2024

@bors retry "failed to remove file miri.exe" on Windows
Cc #127883

@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 Aug 19, 2024
@bors
Copy link
Collaborator

bors commented Aug 20, 2024

⌛ Testing commit 5365b05 with merge fdf61d4...

@bors
Copy link
Collaborator

bors commented Aug 20, 2024

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing fdf61d4 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 20, 2024
@bors bors merged commit fdf61d4 into rust-lang:master Aug 20, 2024
7 checks passed
@rustbot rustbot added this to the 1.82.0 milestone Aug 20, 2024
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (fdf61d4): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results (primary 7.9%, secondary 1.7%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
7.9% [7.9%, 7.9%] 1
Regressions ❌
(secondary)
2.9% [2.2%, 3.5%] 3
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-1.9% [-1.9%, -1.9%] 1
All ❌✅ (primary) 7.9% [7.9%, 7.9%] 1

Cycles

Results (secondary -2.5%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.5% [-2.5%, -2.5%] 1
All ❌✅ (primary) - - 0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 749.461s -> 749.811s (0.05%)
Artifact size: 338.73 MiB -> 338.86 MiB (0.04%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI-spurious-fail-msvc CI spurious failure: target env msvc merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants