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

Bump libc dependency #116527

Merged
merged 1 commit into from
Oct 15, 2023
Merged

Bump libc dependency #116527

merged 1 commit into from
Oct 15, 2023

Conversation

sthibaul
Copy link
Contributor

@sthibaul sthibaul commented Oct 8, 2023

To get GNU/Hurd support, so that CI of external repositories (e.g. getrandom) can build std.

@rustbot
Copy link
Collaborator

rustbot commented Oct 8, 2023

r? @Mark-Simulacrum

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 8, 2023
@rustbot
Copy link
Collaborator

rustbot commented Oct 8, 2023

These commits modify the Cargo.lock file. Unintentional changes to 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.

@klensy
Copy link
Contributor

klensy commented Oct 8, 2023

Already in #116518

To get GNU/Hurd support, so that CI of external repositories (e.g. getrandom)
can build std.
@rustbot rustbot added the T-libs Relevant to the library team, which will review and decide on the PR/issue. label Oct 8, 2023
@sthibaul
Copy link
Contributor Author

sthibaul commented Oct 8, 2023

Well, sure :) Whichever can go first :)

I'd just rather not have to wait for #116518 to go in ;)

@nikarh
Copy link
Contributor

nikarh commented Oct 8, 2023

Well, sure :) Whichever can go first :)

I'd just rather not have to wait for #116518 to go in ;)

No problem, we can rebase, whichever comes first

@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Oct 8, 2023

📌 Commit 04d4336 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 Oct 8, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Oct 8, 2023
Bump libc dependency

To get GNU/Hurd support, so that CI of external repositories (e.g. getrandom) can build std.
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Oct 8, 2023
Bump libc dependency

To get GNU/Hurd support, so that CI of external repositories (e.g. getrandom) can build std.
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 8, 2023
…iaskrgr

Rollup of 3 pull requests

Successful merges:

 - rust-lang#115882 (improve the suggestion of `generic_bound_failure`)
 - rust-lang#116527 (Bump libc dependency)
 - rust-lang#116532 (Add RUSTFLAGS_BOOTSTRAP to RUSTFLAGS for bootstrap compilation)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Contributor

bors commented Oct 9, 2023

⌛ Testing commit 04d4336 with merge 8f879d2...

bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 9, 2023
Bump libc dependency

To get GNU/Hurd support, so that CI of external repositories (e.g. getrandom) can build std.
@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)
---- [ui] tests/ui/panics/default-backtrace-ice.rs stdout ----
diff of stderr:

7 
8 aborting due to `-Z treat-err-as-bug=1`
- (end_short_backtrace)
11 (begin_short_backtrace)
12 (end_short_backtrace)
13 (begin_short_backtrace)
---
To only update this specific test, also pass `--test-args panics/default-backtrace-ice.rs`

error: 1 errors occurred comparing output.
status: exit status: 101
command: env -u RUST_BACKTRACE RUSTC_ICE="0" "/Users/runner/work/rust/rust/build/x86_64-apple-darwin/stage2/bin/rustc" "/Users/runner/work/rust/rust/tests/ui/panics/default-backtrace-ice.rs" "-Zthreads=1" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "-Z" "ignore-directory-in-diagnostics-source-blocks=/Users/runner/.cargo" "--sysroot" "/Users/runner/work/rust/rust/build/x86_64-apple-darwin/stage2" "--target=x86_64-apple-darwin" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Zwrite-long-types-to-disk=no" "-Cstrip=debuginfo" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/Users/runner/work/rust/rust/build/x86_64-apple-darwin/test/ui/panics/default-backtrace-ice" "-A" "unused" "-A" "internal_features" "-Crpath" "-Cdebuginfo=0" "-Lnative=/Users/runner/work/rust/rust/build/x86_64-apple-darwin/native/rust-test-helpers" "-L" "/Users/runner/work/rust/rust/build/x86_64-apple-darwin/test/ui/panics/default-backtrace-ice/auxiliary" "-Z" "treat-err-as-bug=1"
--- stderr -------------------------------
error[E0425]: cannot find value `missing_ident` in this scope
##[error]  --> /Users/runner/work/rust/rust/tests/ui/panics/default-backtrace-ice.rs:21:13
   |
   |
LL | fn main() { missing_ident; }

thread 'rustc' panicked at compiler/rustc_errors/src/lib.rs:1729:30:
thread 'rustc' panicked at compiler/rustc_errors/src/lib.rs:1729:30:
aborting due to `-Z treat-err-as-bug=1`
   0:        0x10f62f7ab - <std::sys_common::backtrace::_print::DisplayBacktrace as core::fmt::Display>::fmt::h177395d3d8418de1
   1:        0x10f68fe93 - core::fmt::write::hc1c750b14da57074
   2:        0x10f624ace - std::io::Write::write_fmt::h90846227315e5971
   3:        0x10f62f589 - std::sys_common::backtrace::print::h37e67e0fd9c26621
   3:        0x10f62f589 - std::sys_common::backtrace::print::h37e67e0fd9c26621
   4:        0x10f632985 - std::panicking::default_hook::{{closure}}::hf0bcf1987dc56ab0
   5:        0x10f6326ec - std::panicking::default_hook::h1c9d1eeb3dddf152
   6:        0x117fdd99c - std[4ddab71e88ffabc8]::panicking::update_hook::<alloc[ff882b6b576a364a]::boxed::Box<rustc_driver_impl[b945dab9ec2dd771]::install_ice_hook::{closure#0}>>::{closure#0}
   8:        0x10f632dc7 - std::panicking::begin_panic_handler::{{closure}}::h018666a93ef3df93
   9:        0x10f62fcb9 - ___muldi3
  10:        0x10f632b3d - _rust_begin_unwind
  11:        0x10f6bb1d5 - core::panicking::panic_fmt::hdcfa6d1a8ed7261a
  11:        0x10f6bb1d5 - core::panicking::panic_fmt::hdcfa6d1a8ed7261a
  12:        0x11cad9f7f - <rustc_errors[234df07e8eb7418a]::HandlerInner>::panic_if_treat_err_as_bug
  13:        0x11cad92c7 - <rustc_errors[234df07e8eb7418a]::HandlerInner>::emit_diagnostic::{closure#2}
  14:        0x118147d0f - rustc_interface[34e128754de438a7]::callbacks::track_diagnostic
  15:        0x11cad8c2e - <rustc_errors[234df07e8eb7418a]::HandlerInner>::emit_diagnostic
  16:        0x11cafc2d1 - <rustc_span[460aa87188fb79b5]::ErrorGuaranteed as rustc_errors[234df07e8eb7418a]::diagnostic_builder::EmissionGuarantee>::diagnostic_builder_emit_producing_guarantee
  17:        0x11b468ced - <rustc_resolve[d481005a0f80da80]::Resolver>::report_errors
  18:        0x11b4e6c63 - <rustc_session[8edcb5d610caeae6]::session::Session>::time::<(), <rustc_resolve[d481005a0f80da80]::Resolver>::resolve_crate::{closure#0}>
  19:        0x11b49c2ce - <rustc_resolve[d481005a0f80da80]::Resolver>::resolve_crate
  20:        0x11814e7d5 - rustc_interface[34e128754de438a7]::passes::resolver_for_lowering
  21:        0x11baec77d - rustc_query_impl[69e45df5d9153614]::plumbing::__rust_begin_short_backtrace::<rustc_query_impl[69e45df5d9153614]::query_impl::resolver_for_lowering::dynamic_query::{closure#2}::{closure#0}, rustc_middle[ead678b98066f0d7]::query::erase::Erased<[u8; 8usize]>>
  22:        0x11bb9b649 - <rustc_query_impl[69e45df5d9153614]::query_impl::resolver_for_lowering::dynamic_query::{closure#2} as core[437206d0e80edbd2]::ops::function::FnOnce<(rustc_middle[ead678b98066f0d7]::ty::context::TyCtxt, ())>>::call_once
  23:        0x11ba3ed6b - rustc_query_system[eb1990ead40b9915]::query::plumbing::try_execute_query::<rustc_query_impl[69e45df5d9153614]::DynamicConfig<rustc_query_system[eb1990ead40b9915]::query::caches::SingleCache<rustc_middle[ead678b98066f0d7]::query::erase::Erased<[u8; 8usize]>>, false, false, false>, rustc_query_impl[69e45df5d9153614]::plumbing::QueryCtxt, false>
  24:        0x11bb2e78a - rustc_query_impl[69e45df5d9153614]::query_impl::resolver_for_lowering::get_query_non_incr::__rust_end_short_backtrace
  25:        0x117f9a0d6 - <rustc_middle[ead678b98066f0d7]::ty::context::GlobalCtxt>::enter::<rustc_driver_impl[b945dab9ec2dd771]::run_compiler::{closure#1}::{closure#2}::{closure#4}, &rustc_data_structures[8573a06969d8253a]::steal::Steal<(rustc_middle[ead678b98066f0d7]::ty::ResolverAstLowering, alloc[ff882b6b576a364a]::rc::Rc<rustc_ast[6d50e1771a2aac12]::ast::Crate>)>>
  26:        0x117fbef76 - rustc_span[460aa87188fb79b5]::set_source_map::<core[437206d0e80edbd2]::result::Result<(), rustc_span[460aa87188fb79b5]::ErrorGuaranteed>, rustc_interface[34e128754de438a7]::interface::run_compiler<core[437206d0e80edbd2]::result::Result<(), rustc_span[460aa87188fb79b5]::ErrorGuaranteed>, rustc_driver_impl[b945dab9ec2dd771]::run_compiler::{closure#1}>::{closure#0}::{closure#0}>
  27:        0x117fa432c - std[4ddab71e88ffabc8]::sys_common::backtrace::__rust_begin_short_backtrace::<rustc_interface[34e128754de438a7]::util::run_in_thread_with_globals<rustc_interface[34e128754de438a7]::interface::run_compiler<core[437206d0e80edbd2]::result::Result<(), rustc_span[460aa87188fb79b5]::ErrorGuaranteed>, rustc_driver_impl[b945dab9ec2dd771]::run_compiler::{closure#1}>::{closure#0}, core[437206d0e80edbd2]::result::Result<(), rustc_span[460aa87188fb79b5]::ErrorGuaranteed>>::{closure#0}::{closure#0}, core[437206d0e80edbd2]::result::Result<(), rustc_span[460aa87188fb79b5]::ErrorGuaranteed>>
  28:        0x117fa5ade - <<std[4ddab71e88ffabc8]::thread::Builder>::spawn_unchecked_<rustc_interface[34e128754de438a7]::util::run_in_thread_with_globals<rustc_interface[34e128754de438a7]::interface::run_compiler<core[437206d0e80edbd2]::result::Result<(), rustc_span[460aa87188fb79b5]::ErrorGuaranteed>, rustc_driver_impl[b945dab9ec2dd771]::run_compiler::{closure#1}>::{closure#0}, core[437206d0e80edbd2]::result::Result<(), rustc_span[460aa87188fb79b5]::ErrorGuaranteed>>::{closure#0}::{closure#0}, core[437206d0e80edbd2]::result::Result<(), rustc_span[460aa87188fb79b5]::ErrorGuaranteed>>::{closure#1} as core[437206d0e80edbd2]::ops::function::FnOnce<()>>::call_once::{shim:vtable#0}
  30:     0x7ff81517d1d3 - __pthread_start

error: the compiler unexpectedly panicked. this is a bug.


note: we would appreciate a bug report: https://github.com/rust-lang/rust/issues/new?labels=C-bug%2C+I-ICE%2C+T-compiler&template=ice.md

note: rustc 1.75.0-nightly (8f879d2d6 2023-10-09) running on x86_64-apple-darwin

note: compiler flags: -Z threads=1 -Z simulate-remapped-rust-src-base=/rustc/FAKE_PREFIX -Z translate-remapped-path-to-local-path=no -Z ignore-directory-in-diagnostics-source-blocks=/Users/runner/.cargo -C codegen-units=1 -Z ui-testing -Z deduplicate-diagnostics=no -Z write-long-types-to-disk=no -C strip=debuginfo -C prefer-dynamic -C rpath -C debuginfo=0 -Z treat-err-as-bug=1
query stack during panic:
#0 [resolver_for_lowering] getting the resolver for lowering
end of query stack
------------------------------------------

@bors
Copy link
Contributor

bors commented Oct 9, 2023

💔 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 Oct 9, 2023
@sthibaul
Copy link
Contributor Author

sthibaul commented Oct 9, 2023

@nnethercote perhaps an idea on this?

@sthibaul
Copy link
Contributor Author

sthibaul commented Oct 9, 2023

(I'm a bit surprised by the duplicated end_short_backtrace/begin_short_backtrace introduced by c3394b3)

@Mark-Simulacrum Mark-Simulacrum 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 Oct 14, 2023
@sthibaul
Copy link
Contributor Author

@chenyukang @Zoxc @jyn514 @Nilstrieb perhaps an idea on this end_short_backtrace/begin_short_backtrace issue?

@Nilstrieb
Copy link
Member

weird issue, make sure it's not spurious before trying to figure out why the libc update could be causing this
@bors rollup=iffy
@bors retry

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 15, 2023
@Nilstrieb
Copy link
Member

ah, indeed. spurious >:(
#116548 (comment)

@bors
Copy link
Contributor

bors commented Oct 15, 2023

⌛ Testing commit 04d4336 with merge d60d63f...

@bors
Copy link
Contributor

bors commented Oct 15, 2023

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 15, 2023
@bors bors merged commit d60d63f into rust-lang:master Oct 15, 2023
12 checks passed
@rustbot rustbot added this to the 1.75.0 milestone Oct 15, 2023
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (d60d63f): 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

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)
2.7% [2.2%, 3.3%] 2
Improvements ✅
(primary)
-1.2% [-2.5%, -0.4%] 6
Improvements ✅
(secondary)
-2.4% [-2.4%, -2.4%] 1
All ❌✅ (primary) -1.2% [-2.5%, -0.4%] 6

Cycles

Results

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: 625.155s -> 624.98s (-0.03%)
Artifact size: 305.52 MiB -> 305.53 MiB (0.00%)

bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 17, 2023
Updated libc and doc for Vita target

Doc changes:

- Updated Vita target readme. The recommended approach to build artifacts for the platform now is [cargo-vita](https://crates.io/crates/cargo-vita) which wraps all the convoluted steps previously described in a yaml for `cargo-make`
- Updated maintainer list for Vita target. (`@ZetaNumbers` `@pheki` please agree to be added to the list, `@amg98` please let us know if you're still planning on actively maintaining target support)

Code changes:
- ~Updated libc for rust-lang/libc#3284 and rust-lang/libc#3366~ (Already merged in rust-lang#116527)
- In dupfd changed the flag same as for esp target, there is no CLOEXEC on Vita
- Enabled `new_pair` since we've implemented `socketpair` in Vita newlib
bors-ferrocene bot added a commit to ferrocene/ferrocene that referenced this pull request Oct 17, 2023
54: Pull upstream master 2023 10 17 r=pietroalbini a=Veykril

* rust-lang/rust#116196
* rust-lang/rust#116824
* rust-lang/rust#116822
* rust-lang/rust#116477
* rust-lang/rust#116826
* rust-lang/rust#116820
  * rust-lang/rust#116811
  * rust-lang/rust#116808
  * rust-lang/rust#116805
  * rust-lang/rust#116800
  * rust-lang/rust#116798
  * rust-lang/rust#116754
* rust-lang/rust#114370
* rust-lang/rust#116804
  * rust-lang/rust#116802
  * rust-lang/rust#116790
  * rust-lang/rust#116786
  * rust-lang/rust#116709
  * rust-lang/rust#116430
  * rust-lang/rust#116257
  * rust-lang/rust#114157
* rust-lang/rust#116731
* rust-lang/rust#116550
* rust-lang/rust#114330
* rust-lang/rust#116724
* rust-lang/rust#116782
  * rust-lang/rust#116776
  * rust-lang/rust#115955
  * rust-lang/rust#115196
* rust-lang/rust#116775
* rust-lang/rust#114589
* rust-lang/rust#113747
* rust-lang/rust#116772
  * rust-lang/rust#116771
  * rust-lang/rust#116760
  * rust-lang/rust#116755
  * rust-lang/rust#116732
  * rust-lang/rust#116522
  * rust-lang/rust#116341
  * rust-lang/rust#116172
* rust-lang/rust#110604
* rust-lang/rust#110729
* rust-lang/rust#116527
* rust-lang/rust#116688
* rust-lang/rust#116757
  * rust-lang/rust#116753
  * rust-lang/rust#116748
  * rust-lang/rust#116741
  * rust-lang/rust#116594
* rust-lang/rust#116691
* rust-lang/rust#116643
* rust-lang/rust#116683
* rust-lang/rust#116635
* rust-lang/rust#115515
* rust-lang/rust#116742
  * rust-lang/rust#116661
  * rust-lang/rust#116576
  * rust-lang/rust#116540
* rust-lang/rust#116352
* rust-lang/rust#116737
  * rust-lang/rust#116730
  * rust-lang/rust#116723
  * rust-lang/rust#116715
  * rust-lang/rust#116603
  * rust-lang/rust#116591
  * rust-lang/rust#115439
* rust-lang/rust#116264
* rust-lang/rust#116727
  * rust-lang/rust#116704
  * rust-lang/rust#116696
  * rust-lang/rust#116695
  * rust-lang/rust#116644
  * rust-lang/rust#116630
* rust-lang/rust#116728
  * rust-lang/rust#116689
  * rust-lang/rust#116679
  * rust-lang/rust#116618
  * rust-lang/rust#116577
  * rust-lang/rust#115653
* rust-lang/rust#116702
* rust-lang/rust#116015
* rust-lang/rust#115822
* rust-lang/rust#116407
* rust-lang/rust#115719
* rust-lang/rust#115524
* rust-lang/rust#116705
* rust-lang/rust#116645
* rust-lang/rust#116233
* rust-lang/rust#115108
* rust-lang/rust#116670
* rust-lang/rust#116676
* rust-lang/rust#116666



Co-authored-by: Benoît du Garreau <bdgdlm@outlook.com>
Co-authored-by: Colin Finck <colin@reactos.org>
Co-authored-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Co-authored-by: Joshua Liebow-Feeser <joshlf@users.noreply.github.com>
Co-authored-by: León Orell Valerian Liehr <me@fmease.dev>
Co-authored-by: Trevor Gross <tmgross@umich.edu>
Co-authored-by: Evan Merlock <evan@merlock.dev>
Co-authored-by: joboet <jonasboettiger@icloud.com>
Co-authored-by: Ralf Jung <post@ralfj.de>
Co-authored-by: DaniPopes <57450786+DaniPopes@users.noreply.github.com>
Co-authored-by: Mark Rousskov <mark.simulacrum@gmail.com>
Co-authored-by: onur-ozkan <work@onurozkan.dev>
Co-authored-by: Nicholas Nethercote <n.nethercote@gmail.com>
Co-authored-by: The 8472 <git@infinite-source.de>
Co-authored-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Co-authored-by: reez12g <reez12g@gmail.com>
Co-authored-by: Jakub Beránek <berykubik@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants