Skip to content

Conversation

Dylan-DPC-zz
Copy link

Successful merges:

Failed merges:

r? @ghost

matthiaskrgr and others added 15 commits February 29, 2020 02:16
Co-Authored-By: Mazdak Farrokhzad <[email protected]>
…f, r=Centril

use .iter() instead of .into_iter() on references
fix aliasing violation in align_to_mut

Fixes rust-lang#68549

I decided to add the testcase here to make it all one PR, but if you prefer I can also add that test case in the Miri repo instead.
improve transmute and Vec::from_raw_parts docs

I think this fixes rust-lang#64073. @Shnatsel please let me know if this is less confusing. :)
…nce-comment, r=varkor

Correct comment to match behavior

Corrects the header comment on `saturating_duration_since` to match the behavior of returning 0 if the other timestamp is _later_ than the invocant, not earlier,

This is purely a documentation change, so hopefully it doesn't require an issue; if it does, I'll open one and resubmit.
rustc_parse: Tweak the function parameter name check

The function doesn't need a full token, only its edition.

Noticed while implementing rust-lang#69384.
I'm still not sure whether normalized or unnormalized token is a better fit for the edition check here, so  rust-lang#69384 and this PR just keep the status quo behavior.
r? @Centril
@Dylan-DPC-zz Dylan-DPC-zz added the rollup A PR which is a rollup label Feb 29, 2020
@Dylan-DPC-zz
Copy link
Author

@bors r+ rollup=never p=7

@bors
Copy link
Collaborator

bors commented Feb 29, 2020

📌 Commit ad200af 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 Feb 29, 2020
@bors
Copy link
Collaborator

bors commented Feb 29, 2020

⌛ Testing commit ad200af with merge d3c7934...

@bors
Copy link
Collaborator

bors commented Feb 29, 2020

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 29, 2020
@bors bors merged commit d3c7934 into rust-lang:master Feb 29, 2020
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. rollup A PR which is a rollup 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.

7 participants