Skip to content

Rollup of 7 pull requests - #68423

Merged
bors merged 32 commits into
rust-lang:masterfrom
Centril:rollup-bdjykrv
Jan 21, 2020
Merged

Rollup of 7 pull requests#68423
bors merged 32 commits into
rust-lang:masterfrom
Centril:rollup-bdjykrv

Conversation

@Centril

Copy link
Copy Markdown
Contributor

Successful merges:

Failed merges:

r? @ghost

ssomersand others added 30 commits January 10, 2020 17:19
…Solaris
See ip(4P) man page:
IP_MULTICAST_TTL Time to live for multicast datagrams. This option
takes an unsigned character as an argument. Its
value is the TTL that IP uses on outgoing multi-
cast datagrams. The default is 1.
IP_MULTICAST_LOOP Loopback for multicast datagrams. Normally multi-
cast datagrams are delivered to members on the
sending host (or sending zone). Setting the
unsigned character argument to 0 causes the oppo-
site behavior, meaning that when multiple zones
are present, the datagrams are delivered to all
zones except the sending zone.
https://docs.oracle.com/cd/E88353_01/html/E37851/ip-4p.htmlhttps://man.openbsd.org/ip.4
…Simulacrum
Simplify NodeHeader by avoiding slices in BTreeMaps with shared roots
Simplify a complicated piece of code that creates slices of keys in node leaves.
…t-out, r=oli-obk
Implement `?const` opt-out for trait bounds
For now, such bounds are treated exactly the same as unprefixed ones in all contexts. [RFC 2632](rust-lang/rfcs#2632) does not specify whether such bounds are forbidden outside of `const` contexts, so they are allowed at the moment.
Prior to this PR, the constness of a trait bound/impl was stored in `TraitRef`. Now, the constness of an `impl` is stored in `ast::ItemKind::Impl` and the constness of a bound in `ast::TraitBoundModifer`. Additionally, constness of trait bounds is now stored in an additional field of `ty::Predicate::Trait`, and the combination of the constness of the item along with any `TraitBoundModifier` determines the constness of the bound in accordance with the RFC. Encoding the constness of impls at the `ty` level is left for a later PR.
After a discussion in \#wg-grammar on Discord, it was decided that the grammar should not encode the mutual exclusivity of trait bound modifiers. The grammar for trait bound modifiers remains `[?const] [?]`. To encode this, I add a dummy variant to `ast::TraitBoundModifier` that is used when the syntax `?const ?` appears. This variant causes an error in AST validation and disappears during HIR lowering.
cc rust-lang#67794
r? @oli-obk
Options IP_MULTICAST_TTL and IP_MULTICAST_LOOP are 1 byte on BSD
Options IP_MULTICAST_TTL and IP_MULTICAST_LOOP are 1 byte on BSD and Solaris
See ip(4P) man page:
IP_MULTICAST_TTL Time to live for multicast datagrams. This option
takes an unsigned character as an argument. Its
value is the TTL that IP uses on outgoing multi-
cast datagrams. The default is 1.
IP_MULTICAST_LOOP Loopback for multicast datagrams. Normally multi-
cast datagrams are delivered to members on the
sending host (or sending zone). Setting the
unsigned character argument to 0 causes the oppo-
site behavior, meaning that when multiple zones
are present, the datagrams are delivered to all
zones except the sending zone.
https://docs.oracle.com/cd/E88353_01/html/E37851/ip-4p.htmlhttps://man.openbsd.org/ip.4
…xcrichton
Actually pass target LLVM args to LLVM
Missed in rust-lang#68059
r? @alexcrichton
check_match: misc unifications and ICE fixes
These are some unifications made as a by-product of working on `hir::ExprKind::Let`.
Fixesrust-lang#68396.
Fixesrust-lang#68394.
Fixesrust-lang#68393.
r? @oli-obk@matthewjasper
…etroalbini
lowering: cleanup some hofs
Some drive-by cleanup while working on `let_chains`.
r? @pietroalbini
@Centril

Copy link
Copy Markdown
ContributorAuthor

@bors r+ p=7 rollup=never

@bors

bors commented Jan 21, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit c1b20b1 has been approved by Centril

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 21, 2020
@bors

bors commented Jan 21, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit c1b20b1 with merge 5e8897b...

bors added a commit that referenced this pull request Jan 21, 2020
Rollup of 7 pull requests
Successful merges:
- #67686 (Simplify NodeHeader by avoiding slices in BTreeMaps with shared roots)
- #68140 (Implement `?const` opt-out for trait bounds)
- #68313 (Options IP_MULTICAST_TTL and IP_MULTICAST_LOOP are 1 byte on BSD)
- #68328 (Actually pass target LLVM args to LLVM)
- #68399 (check_match: misc unifications and ICE fixes)
- #68415 (tidy: fix most clippy warnings)
- #68416 (lowering: cleanup some hofs)
Failed merges:
r? @ghost
@bors

bors commented Jan 21, 2020

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-azure
Approved by: Centril
Pushing 5e8897b to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Jan 21, 2020
@bors
bors merged commit c1b20b1 into rust-lang:masterJan 21, 2020
@rust-highfive

Copy link
Copy Markdown
Contributor

📣 Toolstate changed by #68423!

Tested on commit 5e8897b.
Direct link to PR: #68423

💔 clippy-driver on linux: test-pass → build-fail (cc @mcarton@oli-obk@Manishearth@flip1995@yaahc@phansch@llogiq, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Jan 21, 2020
Tested on commit rust-lang/rust@5e8897b.
Direct link to PR: <rust-lang/rust#68423>
💔 clippy-driver on linux: test-pass → build-fail (cc @mcarton@oli-obk@Manishearth@flip1995@yaahc@phansch@llogiq, @rust-lang/infra).
@Centril
Centril deleted the rollup-bdjykrv branch January 21, 2020 22:17
@borsbors mentioned this pull request Jan 21, 2020
@CentrilCentril added the rollup A PR which is a rollup label Jan 21, 2020
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants

@Centril@bors@rust-highfive@ssomers@batrla@ecstatic-morse@matthiaskrgr