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.

Sign up for GitHub

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

Jump to bottom

Rollup of 15 pull requests #76975

Merged
merged 44 commits into from
Sep 20, 2020
Merged

Rollup of 15 pull requests #76975

merged 44 commits into from
Sep 20, 2020

Conversation

RalfJung
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

camelid and others added 30 commits September 14, 2020 20:05
@camelid
Add docs for BasicBlock
fd79ed4
@camelid
Clarify how branching works in a CFG
a872ec4
@camelid
Improve wording
c051f61 
Co-authored-by: Joshua Nelson <joshua@yottadb.com>
@camelid
Update based on review suggestions
57eb29c
@khyperia
Let backends define custom targets
c946c40 
Add a target_override hook that takes priority over builtin targets.
@khyperia
PR feedback
48655c2
@camelid
Use relative link instead of absolute
451f7f6
@est31
Remove unused libc feature gate
baafc71 
Libc isn't used by alloc.
And std and panic_* use libc from crates.io now,
which isn't feature gated.
@denisvasilik
Use intra-doc links
bdb039d
@denisvasilik
Move to intra-doc links
4af1b90
@denisvasilik
Use intra-doc links
49c8fcb
@pietroalbini
bootstrap: move the version number to a plaintext file
b9af3e3 
The Rust version number is currently embedded in bootstrap's source
code, which makes it hard to update it automatically or access it
outside of ./x.py (as you'd have to parse the source code).

This commit moves the version number to a standalone plaintext file,
which makes accessing or updating it trivial.
@denisvasilik
Update library/alloc/src/collections/binary_heap.rs
2230d8d 
Co-authored-by: Joshua Nelson <joshua@yottadb.com>
@denisvasilik
Update library/alloc/src/collections/binary_heap.rs
ec7225f 
Co-authored-by: Joshua Nelson <joshua@yottadb.com>
@denisvasilik
Update library/alloc/src/collections/binary_heap.rs
62e0ee1 
Co-authored-by: Joshua Nelson <joshua@yottadb.com>
@denisvasilik
Update library/alloc/src/collections/binary_heap.rs
719c40c 
Co-authored-by: Joshua Nelson <joshua@yottadb.com>
README.md: Remove prompts from code blocks
18ce4c1
@GuillaumeGomez
Add missing examples on HashSet iter types
28588e5
@matthiaskrgr
use matches!() macro for simple if let conditions
40dddd3
@lcnr
don't take TyCtxt by reference
925cd26
@lcnr
transmute: use diagnostic item
4debbdc
@lcnr
cfg bootstrap
39f1259
@lcnr
wording
0eecbd4
@lcnr
update docs
bfa2030
@rijenkii
Add tracking issue for feature(unix_socket_peek)
a60f978
@ssomers
BTreeMap: code readability tweaks
c6a8cfb
@Aaron1011
Don't allow implementing trait directly on type-alias-impl-trait
367efa8 
This is specifically disallowed by the RFC, but we never added a check
for it.

Fixes rust-lang#76202
@denisvasilik
Use intra-doc links
f9fa649
@est31
Remove some unused features from alloc core and std
562422e
@RalfJung
Rollup merge of rust-lang#76732 - camelid:mir-basic-block-docs, r=Ral…
39b9a25 
…fJung

Add docs for `BasicBlock`

Fixes rust-lang#76715.

---

@rustbot modify labels: A-mir T-doc C-enhancement
@RalfJung
Rollup merge of rust-lang#76832 - khyperia:backend_target_override, r…
c847eaa 
…=eddyb

Let backends define custom targets

Add a target_override hook that takes priority over builtin targets.
@RalfJung
Rollup merge of rust-lang#76866 - est31:master, r=lcnr
bea0ae7 
Remove unused feature gates from library/ crates

Removes some unused feature gates from library crates. It's likely not a complete list as I only tested a subset for which it's more likely that it is unused.
@RalfJung
Rollup merge of rust-lang#76875 - denisvasilik:intra-doc-links-alloc-…
61a7548 
…binary-heap, r=jyn514

Move to intra-doc links in library/alloc/src/collections/binary_heap.rs

Helps with rust-lang#75080.

@rustbot modify labels: T-doc, A-intra-doc-links
@RalfJung
Rollup merge of rust-lang#76876 - denisvasilik:intra-doc-links-alloc,…
3941201 
… r=jyn514

Move to intra-doc links in collections/btree/map.rs and collections/linked_list.rs

Helps with rust-lang#75080.

@rustbot modify labels: T-doc, A-intra-doc-links
@RalfJung
Rollup merge of rust-lang#76877 - denisvasilik:intra-doc-links-alloc-…
ad9ea71 
…vec-deque, r=jyn514

Move to intra-doc links in collections/vec_deque.rs and collections/vec_deque/drain.rs

Helps with rust-lang#75080.

@rustbot modify labels: T-doc, A-intra-doc-links
@RalfJung
Rollup merge of rust-lang#76878 - pietroalbini:version, r=Mark-Simula…
24980b7 
…crum

Move the version number to a plaintext file

The Rust version number is currently embedded in bootstrap's source code, which makes it hard to update it automatically or access it outside of ./x.py (as you'd have to parse the source code).

This PR moves the version number to a standalone plaintext file, which makes accessing or updating it trivial.

r? @Mark-Simulacrum
@RalfJung
Rollup merge of rust-lang#76883 - qlcom:master, r=Mark-Simulacrum
3ef093b 
README.md: Remove prompts from code blocks

rust-lang#76863
@RalfJung
Rollup merge of rust-lang#76887 - GuillaumeGomez:hashset-iter-types-e…
f24d279 
…xamples, r=Dylan-DPC

Add missing examples on HashSet iter types
@RalfJung
Rollup merge of rust-lang#76890 - matthiaskrgr:matches_simpl, r=lcnr
8405d50 
use matches!() macro for simple if let conditions
@RalfJung
Rollup merge of rust-lang#76891 - lcnr:less-ref, r=ecstatic-morse
9567b5a 
don't take `TyCtxt` by reference

small cleanup
@RalfJung
Rollup merge of rust-lang#76910 - lcnr:foreign-item-like, r=oli-obk
7ff17c1 
transmute: use diagnostic item

closes rust-lang#66075, we now have no remaining uses of `match_def_path`  in the compiler while some uses still remain in `clippy`.

cc @RalfJung
@RalfJung
Rollup merge of rust-lang#76924 - rijenkii:patch-1, r=oli-obk
dfae12f 
Add tracking issue for feature(unix_socket_peek)

Feature was added in rust-lang#73761
@RalfJung
Rollup merge of rust-lang#76926 - ssomers:btree_cleanup_1, r=Mark-Sim…
0a4eb2c 
…ulacrum

BTreeMap: code readability tweaks

Gathered over the past months

r? @Mark-Simulacrum
@RalfJung
Rollup merge of rust-lang#76940 - Aaron1011:fix/trait-on-tait, r=oli-obk
fc58224 
Don't allow implementing trait directly on type-alias-impl-trait

This is specifically disallowed by the RFC, but we never added a check
for it.

Fixes rust-lang#76202
@RalfJung
Copy link
Member Author

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

@bors
Copy link
Contributor

bors commented Sep 20, 2020

📌 Commit fc58224 has been approved by RalfJung

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

bors commented Sep 20, 2020

⌛ Testing commit fc58224 with merge 81e0270...

@bors
Copy link
Contributor

bors commented Sep 20, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: RalfJung
Pushing 81e0270 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 20, 2020
@bors bors merged commit 81e0270 into rust-lang:master Sep 20, 2020
@rustbot rustbot added this to the 1.48.0 milestone Sep 20, 2020
This was referenced Sep 20, 2020
Merged
Merged
Merged
@RalfJung RalfJung deleted the rollup-s2wiuqr branch September 21, 2020 07:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
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
Milestone
1.48.0
Development

Successfully merging this pull request may close these issues.