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

Rollup of 8 pull requests #73402

Merged
merged 18 commits into from
Jun 16, 2020
Merged

Rollup of 8 pull requests #73402

merged 18 commits into from
Jun 16, 2020

Conversation

Dylan-DPC-zz
Copy link

Successful merges:

Failed merges:

r? @ghost

jonas-schievink and others added 18 commits June 14, 2020 13:20
* Check for overflow when calculating the slice start & end position.
* Align the pointer obtained from the allocator, ensuring that it
  satisfies user requested alignment (the allocator is only asked for
  layout compatible with u8 slice).
* Remove an incorrect assertion from DroplessArena::align.
Return a pointer from `alloc_raw` instead of a slice. There is no
practical use for slice as a return type and changing it to a pointer
avoids forming references to an uninitialized memory.
Apparently it got changed.
Check for overflow in DroplessArena and align returned memory

* Check for overflow when calculating the slice start & end position.
* Align the pointer obtained from the allocator, ensuring that it
  satisfies user requested alignment (the allocator is only asked for
  layout compatible with u8 slice).
* Remove an incorrect assertion from DroplessArena::align.
* Avoid forming references to an uninitialized memory in DroplessArena.

Helps with rust-lang#73007, rust-lang#72624.
Don't run generator transform when there's a TyErr

Not sure if this might cause any problems later on, but we shouldn't be hitting codegen or const eval for the produced MIR anyways, so it should be fine.

cc rust-lang#72685 (comment)
…tions, r=kinnison

Re-order correctly the sections in the sidebar

Before that, "trait implementations" and "implementors" titles in the sidebar were before "methods" for example. Which wasn't logical considering that the two sections come after in the "content".

r? @kinnison
…num-cpus, r=Mark-Simulacrum

Add more info to `x.py build --help` on default value for `-j JOBS`.
Use `Ipv4Addr::from<[u8; 4]>` when possible

Resolve this comment: rust-lang#73331 (comment)
Fix forge-platform-support URL

Apparently it got changed.
@Dylan-DPC-zz
Copy link
Author

@bors p=8 r+ rollup=never

@bors
Copy link
Contributor

bors commented Jun 16, 2020

📌 Commit b4dd6a0 has been approved by Dylan-DPC

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 16, 2020
@bors
Copy link
Contributor

bors commented Jun 16, 2020

⌛ Testing commit b4dd6a0 with merge a647c0c...

@Manishearth
Copy link
Member

@Dylan-DPC I mentioned this in chat, but, please don't make rollups that "skip the queue". If the rollup is higher priority than another PR, it should contain PRs that have the same or higher priority. I.e. if the rollup is skipping past p=1 PRs, it should at least contain other p=1 PRs.

These rules are mentioned under the rollup button:

image

Additionally, the point of rollup=always PRs is that they're:

  • not expected to fail
  • pretty minor
  • small enough to not break

which means that they mostly should be used as "filler" in a rollup that contains other substantative PRs, the point of the rollup is to get substantative PRs landed, not to just reduce queue size. This rollup only contains two non-rollup PRs :/

@Manishearth
Copy link
Member

Either wya, created a second rollup that can run after this one #73408

@bors
Copy link
Contributor

bors commented Jun 16, 2020

☀️ Test successful - checks-azure
Approved by: Dylan-DPC
Pushing a647c0c to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 16, 2020
@bors bors merged commit a647c0c into rust-lang:master Jun 16, 2020
@cuviper cuviper added this to the 1.46 milestone May 2, 2024
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.