Skip to content

Rustup#2055

Merged
bors merged 4 commits intorust-lang:masterfrom
RalfJung:rustup
Apr 8, 2022
Merged

Rustup#2055
bors merged 4 commits intorust-lang:masterfrom
RalfJung:rustup

Conversation

@RalfJung
Copy link
Copy Markdown
Member

@RalfJung RalfJung commented Apr 6, 2022 •
edited
Loading

Fixes #1717

@RalfJung
Copy link
Copy Markdown
Member Author

RalfJung commented Apr 6, 2022

@bors r+

@bors
Copy link
Copy Markdown
Contributor

bors commented Apr 6, 2022

📌 Commit 4331747 has been approved by RalfJung

bors added a commit that referenced this pull request Apr 6, 2022
@bors
Auto merge of #2055 - RalfJung:rustup, r=RalfJung
dc7698a 
Rustup
@bors
Copy link
Copy Markdown
Contributor

bors commented Apr 6, 2022

⌛ Testing commit 4331747 with merge dc7698a...

@bors
Copy link
Copy Markdown
Contributor

bors commented Apr 7, 2022

💥 Test timed out

@RalfJung
Copy link
Copy Markdown
Member Author

RalfJung commented Apr 7, 2022

@bors retry

bors added a commit that referenced this pull request Apr 7, 2022
@bors
Auto merge of #2055 - RalfJung:rustup, r=RalfJung
6f26920 
Rustup
@bors
Copy link
Copy Markdown
Contributor

bors commented Apr 7, 2022

⌛ Testing commit 4331747 with merge 6f26920...

@bors
Copy link
Copy Markdown
Contributor

bors commented Apr 7, 2022

💥 Test timed out

@RalfJung
Copy link
Copy Markdown
Member Author

RalfJung commented Apr 7, 2022

@bors retry

@bors
Copy link
Copy Markdown
Contributor

bors commented Apr 7, 2022

⌛ Testing commit 4331747 with merge dd2fefe...

bors added a commit that referenced this pull request Apr 7, 2022
@bors
Auto merge of #2055 - RalfJung:rustup, r=RalfJung
dd2fefe 
Rustup
@RalfJung
Copy link
Copy Markdown
Member Author

RalfJung commented Apr 7, 2022

Hm, this might be an actual failure? But all tests passed locally...

@RalfJung RalfJung mentioned this pull request Apr 7, 2022
Merged
@RalfJung
Copy link
Copy Markdown
Member Author

RalfJung commented Apr 7, 2022

Something odd is definitely going on on Windows targets

./miri run tests/run-pass/hello.rs --target i686-pc-windows-msvc

takes forever locally, too.

@bors r- retry

bors added a commit that referenced this pull request Apr 7, 2022
@bors
Auto merge of #2056 - RalfJung:rustup2, r=RalfJung
809098b 
rustup

Let's go in smaller steps, this might work better than #2055
bors added a commit that referenced this pull request Apr 7, 2022
@bors
Auto merge of #2056 - RalfJung:rustup2, r=RalfJung
8acc9b2 
rustup

Let's go in smaller steps, this might work better than #2055
@RalfJung
Copy link
Copy Markdown
Member Author

RalfJung commented Apr 7, 2022

I think it's probably caused by rust-lang/rust#95469

@bors
Copy link
Copy Markdown
Contributor

bors commented Apr 7, 2022

☔ The latest upstream changes (presumably #2056) made this pull request unmergeable. Please resolve the merge conflicts.

@RalfJung
Copy link
Copy Markdown
Member Author

RalfJung commented Apr 7, 2022

This is now blocked on rust-lang/rust#95775

@RalfJung RalfJung added the S-blocked-on-rust Status: Blocked on landing a Rust PR label Apr 7, 2022
@RalfJung
Copy link
Copy Markdown
Member Author

RalfJung commented Apr 8, 2022

Let's see if this works now.
@bors r+

@bors
Copy link
Copy Markdown
Contributor

bors commented Apr 8, 2022

📌 Commit b4c4d65 has been approved by RalfJung

bors added a commit that referenced this pull request Apr 8, 2022
@bors
Auto merge of #2055 - RalfJung:rustup, r=RalfJung
f108e34 
Rustup
@bors
Copy link
Copy Markdown
Contributor

bors commented Apr 8, 2022

⌛ Testing commit b4c4d65 with merge f108e34...

@RalfJung
Copy link
Copy Markdown
Member Author

RalfJung commented Apr 8, 2022

@bors retry r+

@bors
Copy link
Copy Markdown
Contributor

bors commented Apr 8, 2022

📌 Commit fad53f5 has been approved by RalfJung

bors added a commit that referenced this pull request Apr 8, 2022
@bors
Auto merge of #2055 - RalfJung:rustup, r=RalfJung
ad8dba1 
Rustup
@bors
Copy link
Copy Markdown
Contributor

bors commented Apr 8, 2022

⌛ Testing commit fad53f5 with merge ad8dba1...

@RalfJung RalfJung removed the S-blocked-on-rust Status: Blocked on landing a Rust PR label Apr 8, 2022
@RalfJung
Copy link
Copy Markdown
Member Author

RalfJung commented Apr 8, 2022

Aaaahhh something broke on macOS. Will this ever end?^^

@bors
Copy link
Copy Markdown
Contributor

bors commented Apr 8, 2022

💔 Test failed - checks-actions

@RalfJung
Copy link
Copy Markdown
Member Author

RalfJung commented Apr 8, 2022

Ah no it's the x86_64-pc-windows-msvc target. Probably just a wrong type size in my new code somewhere...

@RalfJung
Copy link
Copy Markdown
Member Author

RalfJung commented Apr 8, 2022

Turns out LONG is i32 and not isize as I expected...

@bors r+

@bors
Copy link
Copy Markdown
Contributor

bors commented Apr 8, 2022

📌 Commit 48d6258 has been approved by RalfJung

bors added a commit that referenced this pull request Apr 8, 2022
@bors
Auto merge of #2055 - RalfJung:rustup, r=RalfJung
4f6b5f0 
Rustup

Fixes #1717
@bors
Copy link
Copy Markdown
Contributor

bors commented Apr 8, 2022

⌛ Testing commit 48d6258 with merge 4f6b5f0...

@bors
Copy link
Copy Markdown
Contributor

bors commented Apr 8, 2022

💔 Test failed - checks-actions

@RalfJung
Copy link
Copy Markdown
Member Author

RalfJung commented Apr 8, 2022

@bors r+

@bors
Copy link
Copy Markdown
Contributor

bors commented Apr 8, 2022

📌 Commit 3da7c55 has been approved by RalfJung

bors added a commit that referenced this pull request Apr 8, 2022
@bors
Auto merge of #2055 - RalfJung:rustup, r=RalfJung
5cb40db 
Rustup

Fixes #1717
@bors
Copy link
Copy Markdown
Contributor

bors commented Apr 8, 2022

⌛ Testing commit 3da7c55 with merge 5cb40db...

@bors
Copy link
Copy Markdown
Contributor

bors commented Apr 8, 2022

💔 Test failed - checks-actions

@RalfJung
Copy link
Copy Markdown
Member Author

RalfJung commented Apr 8, 2022

@bors r+

@bors
Copy link
Copy Markdown
Contributor

bors commented Apr 8, 2022

📌 Commit 3a59a15 has been approved by RalfJung

@bors
Copy link
Copy Markdown
Contributor

bors commented Apr 8, 2022

⌛ Testing commit 3a59a15 with merge be72564...

@bors
Copy link
Copy Markdown
Contributor

bors commented Apr 8, 2022

☀️ Test successful - checks-actions
Approved by: RalfJung
Pushing be72564 to master...

@bors bors merged commit be72564 into rust-lang:master Apr 8, 2022
@RalfJung RalfJung deleted the rustup branch April 8, 2022 15:59
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

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Setting a thread name on Linux doesn't work with tracked raw pointers

2 participants

@RalfJung @bors