Skip to content

Conversation

JohnTitor
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

poliorcetics and others added 20 commits July 29, 2020 21:58
This adds SAFETY comments where necessary, explaining the preconditions and how they are respected.
Show what happens if there is an extra extension
This has less surprising behavior when there is a module with the same name as a primitive in scope.
Co-authored-by: Joshua Nelson <joshua@yottadb.com>
* Rename it in the UI * Rename the CSS classes
Co-authored-by: Joshua Nelson <joshua@yottadb.com>
…lock-in-unsafe-fn, r=Mark-Simulacrum Std panicking unsafe block in unsafe fn Partial fix of rust-lang#73904. This encloses `unsafe` operations in `unsafe fn` in `libstd/ffi/panicking.rs`. I also made a two lines change to `libstd/thread/local.rs` to add the necessary `unsafe` block without breaking everything else. @rustbot modify labels: F-unsafe-block-in-unsafe-fn
Add additional case for Path starts with Show what happens if there is an extra extension
Resolve `char` as a primitive even if there is a module in scope Closes rust-lang#58699. r? @Manishearth
…-traits, r=Manishearth Rename "Important traits" to "Notable traits" Fixes rust-lang#75245. --- * Rename it in the UI * Rename the CSS classes
…ime, r=jyn514 Move to intra-doc links in library/core/src/time.rs Helps with rust-lang#75080.
…r=davidtwco Do not ICE when lowering invalid extern fn with bodies Fix rust-lang#75283.
@JohnTitor
Copy link
Member Author

@rustbot modify labels: +rollup
@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Aug 10, 2020

📌 Commit 5369619 has been approved by JohnTitor

@rustbot rustbot added the rollup A PR which is a rollup label Aug 10, 2020
@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 Aug 10, 2020
@bors
Copy link
Collaborator

bors commented Aug 10, 2020

⌛ Testing commit 5369619 with merge cee62c1...

@bors
Copy link
Collaborator

bors commented Aug 10, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: JohnTitor
Pushing cee62c1 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 10, 2020
@bors bors merged commit cee62c1 into rust-lang:master Aug 10, 2020
@JohnTitor JohnTitor deleted the rollup-q9udsyx branch August 10, 2020 03:22
@cuviper cuviper added this to the 1.47.0 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. 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.