Skip to content

Rollup of 11 pull requests - #38958

Merged
bors merged 26 commits into
rust-lang:masterfrom
sanxiyn:rollup
Jan 10, 2017
Merged

Rollup of 11 pull requests#38958
bors merged 26 commits into
rust-lang:masterfrom
sanxiyn:rollup

Conversation

alexcrichtonand others added 26 commits December 26, 2016 15:21
We don't actually use trampoline_setup.c and all the `*tf3` business
seems related to f80/f128 business. Specifically this'll fix some
warnings showing up during builds on OSX.
Add proc_macro crate type
Add a warning not to convert char* from c to Vec<u8> (I thought you could until I asked on irc)
Changed language to stress char is the C meaning (u8) not unicode.
…nkov
Add test for correct span for type
Adds test for and closesrust-lang#27522.
…hton
Test for appropriate span on second custom derive
Adds test for and closesrust-lang#36935.
…turon
std: Remove unused objects from compiler-builtins
We don't actually use trampoline_setup.c and all the `*tf3` business
seems related to f80/f128 business. Specifically this'll fix some
warnings showing up during builds on OSX.
Replace uses of `#[unsafe_destructor_blind_to_params]` with `#[may_dangle]`
CC rust-lang#34761
r? @pnkfelix
…meGomez
Add more docs for CoerceUnsized and Unsize
here be dragons
r? @ubsan@steveklabnik
…omez
Expand {Path,OsStr}::{to_str,to_string_lossy} doc examples.
None
Update usage of rustc
Add proc_macro crate type
…t, r=nikomatsakis
ICH: Add some more test cases for trait impls.
r? @nikomatsakis
Update vec.rs
Add a warning not to convert char* from c to Vec<u8> (I thought you could until I asked on irc).
Reasoning is that it will help people avoid an error that could cause crashes and undefined behaviour. Only drawback is that it could confuse someone not familiar with C, but beginners are unlikely to be using this function anyway.
@rust-highfive

Copy link
Copy Markdown
Contributor

r? @sfackler

(rust_highfive has picked a reviewer for you, use r? to override)

@sanxiyn

Copy link
Copy Markdown
ContributorAuthor

@bors r+ p=1

@bors

bors commented Jan 10, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit db74f11 has been approved by sanxiyn

@bors

bors commented Jan 10, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit db74f11 with merge 7bffede...

bors added a commit that referenced this pull request Jan 10, 2017
Rollup of 11 pull requests
- Successful merges: #38606, #38607, #38623, #38664, #38799, #38816, #38836, #38839, #38841, #38849, #38874
- Failed merges: #38845
@bors

bors commented Jan 10, 2017

Copy link
Copy Markdown
Collaborator

☀️ Test successful - status-appveyor, status-travis
Approved by: sanxiyn
Pushing 7bffede to master...

@bors
bors merged commit db74f11 into rust-lang:masterJan 10, 2017
@sanxiyn
sanxiyn deleted the rollup branch January 11, 2017 00:22
@CentrilCentril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollupA PR which is a rollup

Projects

None yet

Development

Successfully merging this pull request may close these issues.

15 participants

@sanxiyn@rust-highfive@bors@Centril@sfackler@alexcrichton@apasel422@minaguib@Manishearth@estebank@ollie27@F001@frewsxcv@michaelwoerister@richard-uk1