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.

Sign up for GitHub

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

Jump to bottom

Rollup of 5 pull requests #136774

Closed
wants to merge 11 commits into from
Closed

Rollup of 5 pull requests #136774

wants to merge 11 commits into from

Conversation

Urgau
Copy link
Member

@Urgau Urgau commented Feb 9, 2025

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

GrigorenkoPV and others added 11 commits January 25, 2025 01:09
@GrigorenkoPV
Stabilize vec_pop_if
2ecb40e
@Berrysoft @Noratrieb @workingjubilee
Add cygwin target.
68081f4 
Co-authored-by: Ookiineko <chiisaineko@protonmail.com>
Co-authored-by: nora <48135649+Noratrieb@users.noreply.github.com>
Co-authored-by: Jubilee <workingjubilee@gmail.com>
@Berrysoft
Apply suggestions
402a52e
@GuillaumeGomez
Update minifier version to 0.3.4
a3a9c28
@matthiaskrgr
crashes: more tests
fb52da3
@chenyukang
Fix unwrap error in overflowing int literal
ace6bb9
@Urgau
Rollup merge of rust-lang#134999 - Berrysoft:dev/new-cygwin-target, r…
8f70131 
…=chenyukang

Add cygwin target.

r? compiler-team

This PR simply adds cygwin target together with msys2 target, based on ``@ookiineko`` 's (the account has been deleted) [work](https://github.com/ookiineko-cygport/rust) on cygwin target. My full work is here: rust-lang/rust@master...Berrysoft:rust:dev/cygwin

I have succeeded in building a new rustc for cygwin target, and eventually distributed a new version of [fish-shell](https://github.com/Berrysoft/fish-shell/releases) (rewritten by Rust) for MSYS2.

I will open a new PR to fix std if this PR is accepted.
@Urgau
Rollup merge of rust-lang#135488 - GrigorenkoPV:vec_pop_if, r=jhpratt
13dc27a 
Stabilize `vec_pop_if`

Tracking issue: rust-lang#122741

FCP completed in rust-lang#122741 (comment)
@Urgau
Rollup merge of rust-lang#136068 - matthiaskrgr:crashesjan25, r=Mark-…
733dfd5 
…Simulacrum

crashes: more tests

try-job: aarch64-apple
try-job: x86_64-msvc-1
try-job: x86_64-gnu
try-job: dist-i586-gnu-i586-i686-musl
@Urgau
Rollup merge of rust-lang#136694 - GuillaumeGomez:update-minifier, r=…
3f2bda6 
…notriddle

Update minifier version to `0.3.4`

It fixes a bug where a whitespace would get removed in `a [attribute]` (you're not forced to add a tag before an attribute selector).

r? ```@notriddle```
@Urgau
Rollup merge of rust-lang#136760 - chenyukang:fix-overflowing-int-lin…
2d5a1bd 
…t-crash, r=oli-obk

Fix unwrap error in overflowing int literal

Fixes rust-lang#136675

it's maybe `negative` only from [check_lit](https://github.com/chenyukang/rust/blob/526e3288feb68eac55013746e03fb54d6a0b9a1e/compiler/rustc_lint/src/types.rs#L546), in this scenario the fields in `TypeLimits` is none.

r? `@oli-obk`
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Feb 9, 2025
@Urgau
Copy link
Member Author

Urgau commented Feb 9, 2025

@bors r+ p=5 rollup=never

@bors
Copy link
Contributor

bors commented Feb 9, 2025

📌 Commit 2d5a1bd has been approved by Urgau

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 Feb 9, 2025
@bors
Copy link
Contributor

bors commented Feb 9, 2025

⌛ Testing commit 2d5a1bd with merge ea6fdd2...

bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 9, 2025
@bors
Auto merge of rust-lang#136774 - Urgau:rollup-cm061qo, r=Urgau
ea6fdd2 
Rollup of 5 pull requests

Successful merges:

 - rust-lang#134999 (Add cygwin target.)
 - rust-lang#135488 (Stabilize `vec_pop_if`)
 - rust-lang#136068 (crashes: more tests)
 - rust-lang#136694 (Update minifier version to `0.3.4`)
 - rust-lang#136760 (Fix unwrap error in overflowing int literal)

r? `@ghost`
`@rustbot` modify labels: rollup
@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot) 
##[endgroup]
[TIMING] core::build_steps::tool::ToolBuild { compiler: Compiler { stage: 0, host: aarch64-unknown-linux-gnu }, target: aarch64-unknown-linux-gnu, tool: "tidy", path: "src/tools/tidy", mode: ToolBootstrap, source_type: InTree, extra_features: [], allow_features: "", cargo_args: [] } -- 30.325
[TIMING] core::build_steps::tool::Tidy { compiler: Compiler { stage: 0, host: aarch64-unknown-linux-gnu }, target: aarch64-unknown-linux-gnu } -- 0.000
fmt check
Diff in /checkout/compiler/rustc_target/src/spec/base/cygwin.rs:3:
 use crate::spec::{Cc, DebuginfoKind, LinkerFlavor, Lld, SplitDebuginfo, TargetOptions, cvs};
 pub(crate) fn opts() -> TargetOptions {
 pub(crate) fn opts() -> TargetOptions {
-    let mut pre_link_args = TargetOptions::link_args(LinkerFlavor::Gnu(Cc::No, Lld::No), &[
-        "--disable-dynamicbase",
-        "--enable-auto-image-base",
-    ]);
-    crate::spec::add_link_args(&mut pre_link_args, LinkerFlavor::Gnu(Cc::Yes, Lld::No), &[
-        "-Wl,--disable-dynamicbase",
-        "-Wl,--enable-auto-image-base",
+    let mut pre_link_args = TargetOptions::link_args(
+    let mut pre_link_args = TargetOptions::link_args(
+        LinkerFlavor::Gnu(Cc::No, Lld::No),
+        &["--disable-dynamicbase", "--enable-auto-image-base"],
+    crate::spec::add_link_args(
+        &mut pre_link_args,
+        &mut pre_link_args,
+        LinkerFlavor::Gnu(Cc::Yes, Lld::No),
+        &["-Wl,--disable-dynamicbase", "-Wl,--enable-auto-image-base"],
+    );
     let cygwin_libs = &["-lcygwin", "-lgcc", "-lcygwin", "-luser32", "-lkernel32", "-lgcc_s"];
     let mut late_link_args =
         TargetOptions::link_args(LinkerFlavor::Gnu(Cc::No, Lld::No), cygwin_libs);
Build completed unsuccessfully in 0:00:48
  local time: Sun Feb  9 18:39:43 UTC 2025
  network time: Sun, 09 Feb 2025 18:39:43 GMT
##[error]Process completed with exit code 1.

@bors
Copy link
Contributor

bors commented Feb 9, 2025

💔 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 Feb 9, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@Urgau @bors @rust-log-analyzer @matthiaskrgr @rustbot @GrigorenkoPV @Berrysoft @GuillaumeGomez @chenyukang