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

Rolling up PRs in the queue #16308

Closed
wants to merge 23 commits into from
Closed

Conversation

alexcrichton
Copy link
Member

No description provided.

vadimcn and others added 23 commits August 4, 2014 17:42
_WIN32 is defined for 64-bit builds as well, so test for _WIN64 first.
This is important when building with --disable-jemalloc: unlike jemalloc,  msvcrt does not align on 16 bytes unless asked to.
The original trick used to trigger unwinds would not work with GCC's implementation of SEH, so I had to invent a new one: rust_try now consists of two routines: the outer one, whose handler triggers unwinds, and the inner one, that stops unwinds by having a landing pad that swallows exceptions and passes them on to the outer routine via a normal return.
This ended up passing through the lexer but dying later on in parsing when it
wasn't handled. The strategy taken was to copy the `str_lit` funciton, but adapt
it for bytes.

Closes rust-lang#16278
There's a good long comment explaining why. The tl;dr; is that I have no idea
why this is necessary, but it gets --test to work on windows which is something,
right?

cc rust-lang#13259
cc rust-lang#16275
cc rust-lang/cargo#302
For a good measure, implemented target_record_stack_bounds for 32-bit Windows as well.
… to separate text from the edge of the newly added background.
@lilyball
Copy link
Contributor

lilyball commented Aug 6, 2014

Merge commit '3b41f3256228ffb01225eab671ef301aa18337d7' into rollup

That's really kind of ugly. Can you not provide a better merge message? At least do something like Merge branch SimonSapin/patch-8 into rollup (although that particular example isn't a great branch name).

I'm also curious as to why only the latter commits are merges. Did you switch to the merge strategy midway through constructing this PR? I think that's just a GitHub display issue, ugh.

@lilyball
Copy link
Contributor

lilyball commented Aug 6, 2014

Ideally you'd construct something equivalent to the merge messages bors constructs. I don't know how feasible that is; are you doing this by hand, doing this with a script that operates on GitHub, or doing this with a script that operates on a list of remotes you've given it?

bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants