Rollup of 8 pull requests by jonas-schievink · Pull Request #77544 · rust-lang/rust

jonas-schievink · 2020-10-04T20:16:22Z

Successful merges:

Add check for doc alias attribute at crate level #76329 (Add check for doc alias attribute at crate level)
core::global_allocator docs link to std::alloc::GlobalAlloc #77219 (core::global_allocator docs link to std::alloc::GlobalAlloc)
BTreeMap: admit the existence of leaf edges in comments #77395 (BTreeMap: admit the existence of leaf edges in comments)
Include scope id in SocketAddrV6::Display #77426 (Include scope id in SocketAddrV6::Display)
BTreeMap: refactoring around edges, missed spots #77471 (BTreeMap: refactoring around edges, missed spots)
Update to chalk 0.31 #77515 (Update to chalk 0.31)
Avoid unchecked casts in net parser #77528 (Avoid unchecked casts in net parser)
Disallow overriding forbid in same scope #77534 (Disallow overriding forbid in same scope)

Failed merges:

… in compare mode chalk don't finish.

…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...)

That is, this changes `#[forbid(foo)] #[allow(foo)]` from allowing foo to forbidding foo.

@ollie27

…hewjasper Add check for doc alias attribute at crate level Fixes#76298, #64734, #69365. r? @ollie27

core::global_allocator docs link to std::alloc::GlobalAlloc Closes#77100

@Mark-Simulacrum

…=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

@tmandry

Include scope id in SocketAddrV6::Display r? @tmandry I couldn't find any unit tests for these functions. cc @ghanan94 @brunowonka

@Mark-Simulacrum

BTreeMap: refactoring around edges, missed spots Tweaks from #77244 (and more) that are really inconsistencies in #77005. r? @Mark-Simulacrum

@nikomatsakis

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

@dtolnay

Avoid unchecked casts in net parser Once this and #77426 are in, I'll send another PR adding scope id parsing. r? @dtolnay

…e-forbid-in-same-scope, r=petrochenkov Disallow overriding forbid in same scope Rebased #73379. Fixes#70819.

jonas-schievink · 2020-10-04T20:17:20Z

@bors r+ rollup=never p=8

@rustbot modify labels: rollup

bors · 2020-10-04T20:17:21Z

📌 Commit 04fcbc7 has been approved by jonas-schievink

bors · 2020-10-04T20:33:25Z

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

bors · 2020-10-04T21:07:57Z

💔 Test failed - checks-actions

mightyiamand others added 23 commits September 29, 2020 14:39

core::global_allocator docs link to std::alloc::GlobalAlloc
badf4af

BTreeMap: admit the existence of leaf edges in comments
df76cf8

BTreeMap: refactoring around edges, missed spots
d71d13e

Prevent #[doc(alias = "...")] at crate level
0e68e1b

Add test for #[doc(alias = "...")] at crate level
5c836e3

Ensure that the error isn't displayed more than once
0e18017

Run attributes check at crate level
3950a6d

Strenghten tests for crate-level attributes check
6ec2474

Update to chalk 0.31. Implement some unimplemented. Ignore some tests…
3d17eb3
… in compare mode chalk don't finish.

Enforce crate level attributes checks
3641a37

Include scope id in SocketAddrV6::Display
4585c22

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...)

Avoid unchecked casts in net parser
9601724

Inline "eof" methods
f78a7ad

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.

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

Rollup merge of#77219- mightyiam:issue_77100, r=jyn514
4268859
core::global_allocator docs link to std::alloc::GlobalAlloc Closes#77100

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

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

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

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

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.

rustbot added the rollup A PR which is a rollup label Oct 4, 2020

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 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 mentioned this pull request Oct 4, 2020
Update to chalk 0.31 #77515
Merged

jonas-schievink closed this Oct 4, 2020

Navigation Menu

Uh oh!

Uh oh!

Rollup of 8 pull requests - #77544

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

jonas-schievink commented Oct 4, 2020

Uh oh!

jonas-schievink commented Oct 4, 2020

Uh oh!

bors commented Oct 4, 2020

Uh oh!

bors commented Oct 4, 2020

Uh oh!

bors commented Oct 4, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

Uh oh!

Uh oh!

Conversation

jonas-schievink commented Oct 4, 2020

Uh oh!

jonas-schievink commented Oct 4, 2020

Uh oh!

bors commented Oct 4, 2020

Uh oh!

bors commented Oct 4, 2020

Uh oh!

bors commented Oct 4, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants