Skip to content

Rollup of 8 pull requests#77544

Closed
jonas-schievink wants to merge 23 commits intorust-lang:masterfrom
jonas-schievink:rollup-kti7r94
Closed

Rollup of 8 pull requests#77544
jonas-schievink wants to merge 23 commits intorust-lang:masterfrom
jonas-schievink:rollup-kti7r94

Conversation

@jonas-schievink
Copy link
Contributor

@jonas-schievink jonas-schievink commented Oct 4, 2020

Successful merges:

Failed merges:

r? @ghost

mightyiam and others added 23 commits September 29, 2020 14:39
@mightyiam
core::global_allocator docs link to std::alloc::GlobalAlloc
badf4af
@ssomers
BTreeMap: admit the existence of leaf edges in comments
df76cf8
@ssomers
BTreeMap: refactoring around edges, missed spots
d71d13e
@GuillaumeGomez
Prevent #[doc(alias = "...")] at crate level
0e68e1b
@GuillaumeGomez
Add test for #[doc(alias = "...")] at crate level
5c836e3
@GuillaumeGomez
Ensure that the error isn't displayed more than once
0e18017
@GuillaumeGomez
Run attributes check at crate level
3950a6d
@GuillaumeGomez
Strenghten tests for crate-level attributes check
6ec2474
@jackh726
Update to chalk 0.31. Implement some unimplemented. Ignore some tests…
3d17eb3 
… in compare mode chalk don't finish.
@GuillaumeGomez
Enforce crate level attributes checks
3641a37
@tamird
Include scope id in SocketAddrV6::Display
4585c22
@pnkfelix @Mark-Simulacrum
rewrite old test so that its attributes are consistent with what we w…
b4e77d2 
…ant in the language.

(Note that the fact this test existed is a slight sign that we may need a crater
run on this bugfix...)
@tamird
Avoid unchecked casts in net parser
9601724
@tamird
Inline "eof" methods
f78a7ad
@pnkfelix @Mark-Simulacrum
Prevent forbid from being ignored if overriden at the same level.
afa2a67 
That is, this changes `#[forbid(foo)] #[allow(foo)]` from allowing foo to
forbidding foo.
@jonas-schievink
Rollup merge of #76329 - GuillaumeGomez:doc-alias-crate-level, r=matt…
61fbf53 
…hewjasper

Add check for doc alias attribute at crate level

Fixes #76298, #64734, #69365.

r? @ollie27
@jonas-schievink
Rollup merge of #77219 - mightyiam:issue_77100, r=jyn514
4268859 
core::global_allocator docs link to std::alloc::GlobalAlloc

Closes #77100
@jonas-schievink
Rollup merge of #77395 - ssomers:btree_love_the_leaf_edge_comments, r…
9434988 
…=Mark-Simulacrum

BTreeMap: admit the existence of leaf edges in comments

The btree code is ambiguous about leaf edges (i.e., edges within leaf nodes). Iteration relies on them heavily, but some of the comments suggest there are no leaf edges (extracted from #77025)

r? @Mark-Simulacrum
@jonas-schievink
Rollup merge of #77426 - tamird:sockaddr-scope-id, r=dtolnay
1c397b9 
Include scope id in SocketAddrV6::Display

r? @tmandry

I couldn't find any unit tests for these functions.

cc @ghanan94 @brunowonka
@jonas-schievink
Rollup merge of #77471 - ssomers:btree_cleanup_3, r=Mark-Simulacrum
ba5d93d 
BTreeMap: refactoring around edges, missed spots

Tweaks from #77244 (and more) that are really inconsistencies in #77005.

r? @Mark-Simulacrum
@jonas-schievink
Rollup merge of #77515 - jackh726:chalk-0.31, r=matthewjasper
ce5455e 
Update to chalk 0.31

Gonna assign @nikomatsakis to the review here, but since he is pretty busy recently, if anyone else wants to review this, that would be much appreciated.

r? @nikomatsakis
@jonas-schievink
Rollup merge of #77528 - tamird:avoid-cast-net-parser, r=dtolnay
bdd34bc 
Avoid unchecked casts in net parser

Once this and #77426 are in, I'll send another PR adding scope id parsing.

r? @dtolnay
@jonas-schievink
Rollup merge of #77534 - Mark-Simulacrum:issue-70819-disallow-overrid…
04fcbc7 
…e-forbid-in-same-scope, r=petrochenkov

Disallow overriding forbid in same scope

Rebased #73379.

Fixes #70819.
@jonas-schievink
Copy link
Contributor Author

jonas-schievink commented Oct 4, 2020

@bors r+ rollup=never p=8

@rustbot modify labels: rollup

@bors
Copy link
Collaborator

bors commented Oct 4, 2020

📌 Commit 04fcbc7 has been approved by jonas-schievink

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

bors commented Oct 4, 2020

⌛ Testing commit 04fcbc7 with merge 098c82810293a4cfb120cd506a537892454c0899...

@bors
Copy link
Collaborator

bors commented Oct 4, 2020

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 4, 2020
@jonas-schievink jonas-schievink mentioned this pull request Oct 4, 2020
Merged
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

rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

9 participants

@jonas-schievink @bors @rustbot @mightyiam @ssomers @GuillaumeGomez @jackh726 @tamird @pnkfelix