Rollup of 14 pull requests by tmandry · Pull Request #76231 · rust-lang/rust

tmandry · 2020-09-02T01:24:49Z

Successful merges:

Add trailing comma support to matches macro #74880 (Add trailing comma support to matches macro)
Add new -Z dump-mir-spanview option #76074 (Add new -Z dump-mir-spanview option)
Add more examples to lexicographic cmp on Iterators. #76088 (Add more examples to lexicographic cmp on Iterators.)
Add info about ! and impl Trait #76099 (Add info about ! and impl Trait)
Use "Fira Sans" for crate list font #76126 (Use "Fira Sans" for crate list font)
Factor out StmtKind::MacCall fields into MacCallStmt struct #76132 (Factor out StmtKind::MacCall fields into MacCallStmt struct)
Give a better error message for duplicate built-in macros #76143 (Give a better error message for duplicate built-in macros)
Stabilise link-self-contained option #76158 (Stabilise link-self-contained option)
Move to intra-doc links for library/core/src/panic.rs #76201 (Move to intra-doc links for library/core/src/panic.rs)
Make all methods of std::net::Ipv6Addr const #76206 (Make all methods of std::net::Ipv6Addr const)
# Move to intra-doc links for library/core/src/clone.rs #76207 (# Move to intra-doc links for library/core/src/clone.rs)
Document lint missing_doc_code_examples is nightly-only #76212 (Document lint missing_doc_code_examples is nightly-only)
lexer: Tiny improvement to shebang detection #76218 (lexer: Tiny improvement to shebang detection)
Clean up header in iter docs for for loops #76221 (Clean up header in iter docs for for loops)

Failed merges:

The most important rule of lexicographical comparison is that two arrays of equal length will be compared until the first difference occured. The examples provided only focuses on the second rule that says that the shorter array will be filled with some T2 that is less than every T. Which is only possible because of the first rule.

I no longer say "polymorphic" since it's a bit ambiguous here.

In PR rust-lang#76130, I add a fourth field, which makes using a tuple variant somewhat unwieldy.

This reverts commit 7e2548f. Now I know why it was redefined: it seems like it's potentially because of the orphan rule. Here are the error messages: error[E0119]: conflicting implementations of trait `std::fmt::Debug` for type `!`: --> src/primitive_docs.rs:236:1 | 6 | impl Debug for ! { | ^^^^^^^^^^^^^^^^ | = note: conflicting implementation in crate `core`: - impl std::fmt::Debug for !; error[E0117]: only traits defined in the current crate can be implemented for arbitrary types --> src/primitive_docs.rs:236:1 | 6 | impl Debug for ! { | ^^^^^^^^^^^^^^^- | | | | | `!` is not defined in the current crate | impl doesn't use only types from inside the current crate | = note: define and implement a trait or new type instead

Co-authored-by: Joshua Nelson <joshua@yottadb.com>

Similar to `-Z dump-mir-graphviz`, this adds the option to write HTML+CSS files that allow users to analyze the spans associated with MIR elements (by individual statement, just terminator, or overall basic block). This PR was split out from PR rust-lang#76004, and exposes an API for spanview HTML+CSS files that is also used to analyze code regions chosen for coverage instrumentation (in a follow-on PR). Rust compiler MCP rust-lang/compiler-team#278 Relevant issue: rust-lang#34701 - Implement support for LLVMs code coverage instrumentation

Previously, this would say no such macro existed, but this was misleading, since the macro _did_ exist, it was just already seen. - Say where the macro was previously defined - Add long-form error message

Co-authored-by: Joshua Nelson <joshua@yottadb.com>

Make the following methods of `std::net::Ipv6Addr` unstable const under the `const_ipv6` feature: - `segments` - `is_unspecified` - `is_loopback` - `is_global` (unstable) - `is_unique_local` - `is_unicast_link_local_strict` - `is_documentation` - `multicast_scope` - `is_multicast` - `to_ipv4_mapped` - `to_ipv4` Changed the implementation of `is_unspecified` and `is_loopback` to use a `match` instead of `==`. Part of rust-lang#76205

… from `matches!` to `u128` comparison Done because `matches!` doesn't optimize well with array comparisons

Fira Sans is what's used for module lists and other item lists. Previously, the default body font, "Source Serif Pro", was used for crate lists, which didn't visually match other item lists.

Lexer now discerns between regular comments and doc comments, so use that. The change only affects the choice of reported errors.

Add trailing comma support to matches macro

@tmandry

…5.1, r=wesleywiser Add new `-Z dump-mir-spanview` option Similar to `-Z dump-mir-graphviz`, this adds the option to write HTML+CSS files that allow users to analyze the spans associated with MIR elements (by individual statement, just terminator, or overall basic block). This PR was split out from PR rust-lang#76004, and exposes an API for spanview HTML+CSS files that is also used to analyze code regions chosen for coverage instrumentation (in a follow-on PR). Rust compiler MCP rust-lang/compiler-team#278 Relevant issue: rust-lang#34701 - Implement support for LLVMs code coverage instrumentation r? @tmandry FYI @wesleywiser

Add more examples to lexicographic cmp on Iterators. Given two arrays of T1 and T2, the most important rule of lexicographical comparison is that two arrays of equal length will be compared until the first difference occured. The examples provided only focuses on the second rule that says that the shorter array will be filled with some T2 that is less than every T1. Which is only possible because of the first rule.

@rustbot

Add info about `!` and `impl Trait` Fixesrust-lang#76094. @rustbot modify labels: T-doc C-enhancement

@rustbot

…eGomez Use "Fira Sans" for crate list font Fira Sans is what's used for module lists and other item lists. Previously, the default body font, "Source Serif Pro", was used for crate lists, which didn't visually match other item lists. @rustbot modify labels: T-rustdoc

…nkov Factor out StmtKind::MacCall fields into `MacCallStmt` struct In PR rust-lang#76130, I add a fourth field, which makes using a tuple variant somewhat unwieldy.

@petrochenkov

…petrochenkov Give a better error message for duplicate built-in macros Minor follow-up to rust-lang#75176 giving a better error message for duplicate builtin macros. This would have made it a little easier to debug. r? @petrochenkov

…trochenkov Stabilise link-self-contained option MCP has been accepted: rust-lang/compiler-team#343 I'll add improved heuristic in next PR.

@rustbot

…anic, r=kennytm Move to intra-doc links for library/core/src/panic.rs Helps with rust-lang#75080. @rustbot modify labels: T-doc, A-intra-doc-links, T-rustdoc Known issues: * Link from `core` to `std` (rust-lang#74481): [`set_hook`] [`String`]

Make all methods of `std::net::Ipv6Addr` const Make the following methods of `std::net::Ipv6Addr` unstable const under the `const_ipv6` feature: - `segments` - `is_unspecified` - `is_loopback` - `is_global` (unstable) - `is_unique_local` - `is_unicast_link_local_strict` - `is_documentation` - `multicast_scope` - `is_multicast` - `to_ipv4_mapped` - `to_ipv4` This would make all methods of `Ipv6Addr` const. Changed the implementation of `is_unspecified` and `is_loopback` to use a `match` instead of `==`, all other methods did not require a change. All these methods are dependent on `segments`, the current implementation of which requires unstable `const_fn_transmute` ([PR#75085](rust-lang#75085)). Part of rust-lang#76205

@rustbot

…lone, r=jyn514 # Move to intra-doc links for library/core/src/clone.rs Helps with rust-lang#75080. @rustbot modify labels: T-doc, A-intra-doc-links

Document lint missing_doc_code_examples is nightly-only Closesrust-lang#76194

lexer: Tiny improvement to shebang detection Lexer now discerns between regular comments and doc comments, so use that. The change only affects the choice of reported errors.

@rustbot

Clean up header in `iter` docs for `for` loops @rustbot modify labels: T-doc

tmandry · 2020-09-02T01:25:10Z

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

bors · 2020-09-02T01:25:12Z

📌 Commit 4dd75f8 has been approved by tmandry

tmandry · 2020-09-02T01:27:51Z

@bors retry

bors · 2020-09-02T01:29:34Z

⌛ Testing commit 4dd75f8 with merge e36e4bd...

bors · 2020-09-02T03:17:24Z

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

chrisduerrand others added 30 commits July 28, 2020 18:42

Add trailing comma support to matches macro
f3d7645

Add info about ! and impl Trait
4aae781

cannot have divergence -> cannot diverge
fd985e2

It's only an issue without an impl Trait for !
0d9a2ab

Specify 0 of type u32
26eab6a

Be more specific about polymorphic return types
80dcad9
I no longer say "polymorphic" since it's a bit ambiguous here.

other branch -> else branch
bd31962

Import Debug instead of redefining it
7e2548f

Explain why the 0 is a u32
37ea97c

Factor out StmtKind::MacCall fields into MacCallStmt struct
090b167
In PR rust-lang#76130, I add a fourth field, which makes using a tuple variant somewhat unwieldy.

Fix clippy
ee19021

Stabilise link-self-contained option
23f0ccf

Remove empty comment
cdd6f11

Improve wording
c4c058c
Co-authored-by: Joshua Nelson <joshua@yottadb.com>

Improve assert! section in bool docs
913354b

Break line at 100 characters
55637f5

Give a better error message for duplicate built-in macros
be2947d
Previously, this would say no such macro existed, but this was misleading, since the macro _did_ exist, it was just already seen. - Say where the macro was previously defined - Add long-form error message

Use intra-doc links
9c7fb6c

Enhance wording
b639cb1
Co-authored-by: Joshua Nelson <joshua@yottadb.com>

Use intra-doc links
e7d0743

Improve readability
3510c56

Document lint missing_doc_code_examples is nightly-only
7eb4b1b

Add test for Ipv6Addr methods in a const context
cd08def

Change implementation of Ipv6Addr::is_unspecified and is_loopback…
a43dd4f
… from `matches!` to `u128` comparison Done because `matches!` doesn't optimize well with array comparisons

Add trailing newline to ipv6.rs
9afe97c

Use "Fira Sans" for crate list font
c86d249
Fira Sans is what's used for module lists and other item lists. Previously, the default body font, "Source Serif Pro", was used for crate lists, which didn't visually match other item lists.

petrochenkovand others added 16 commits September 2, 2020 00:40

lexer: Tiny improvement to shebang detection
b1491ea
Lexer now discerns between regular comments and doc comments, so use that. The change only affects the choice of reported errors.

Clean up header in iter docs for for loops
e5c17bf

Rollup merge ofrust-lang#74880- chrisduerr:fix_matches, r=dtolnay
383da5e
Add trailing comma support to matches macro

Rollup merge ofrust-lang#76099- camelid:patch-8, r=jyn514
34c8b7a
Add info about `!` and `impl Trait` Fixesrust-lang#76094. @rustbot modify labels: T-doc C-enhancement

Rollup merge ofrust-lang#76132- Aaron1011:mac-call-stmt, r=petroche…
738b8ea
…nkov Factor out StmtKind::MacCall fields into `MacCallStmt` struct In PR rust-lang#76130, I add a fourth field, which makes using a tuple variant somewhat unwieldy.

Rollup merge ofrust-lang#76158- mati865:self-contained-option, r=pe…
4a6aa35
…trochenkov Stabilise link-self-contained option MCP has been accepted: rust-lang/compiler-team#343 I'll add improved heuristic in next PR.

Rollup merge ofrust-lang#76207- denisvasilik:intra-doc-links-core-c…
7edc93b
…lone, r=jyn514 # Move to intra-doc links for library/core/src/clone.rs Helps with rust-lang#75080. @rustbot modify labels: T-doc, A-intra-doc-links

Rollup merge ofrust-lang#76212- JesHansen:fix-lint-doc, r=jyn514
c22de44
Document lint missing_doc_code_examples is nightly-only Closesrust-lang#76194

Rollup merge ofrust-lang#76218- petrochenkov:shebang3, r=matklad
56b5de2
lexer: Tiny improvement to shebang detection Lexer now discerns between regular comments and doc comments, so use that. The change only affects the choice of reported errors.

Rollup merge ofrust-lang#76221- camelid:cleanup-iter-for, r=jyn514
4dd75f8
Clean up header in `iter` docs for `for` loops @rustbot modify labels: T-doc

rustbot added the rollup A PR which is a rollup label Sep 2, 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 Sep 2, 2020

bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 2, 2020

bors merged commit e36e4bd into rust-lang:masterSep 2, 2020

This was referenced Sep 2, 2020
Implement rustc side of report-future-incompat #75534
Merged
Syntactically permit unsafety on mods #75857
Merged

tmandry deleted the rollup-ilvs9fq branch September 2, 2020 19:21

cuviper added this to the 1.48.0 milestone Nov 16, 2023

Navigation Menu

Uh oh!

Uh oh!

Rollup of 14 pull requests - #76231

Rollup of 14 pull requests#76231
bors merged 46 commits into
rust-lang:masterfrom
tmandry:rollup-ilvs9fq

tmandry commented Sep 2, 2020

Uh oh!

tmandry commented Sep 2, 2020

Uh oh!

bors commented Sep 2, 2020

Uh oh!

tmandry commented Sep 2, 2020

Uh oh!

bors commented Sep 2, 2020

Uh oh!

bors commented Sep 2, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

14 participants

Uh oh!

Uh oh!

Conversation

tmandry commented Sep 2, 2020

Uh oh!

tmandry commented Sep 2, 2020

Uh oh!

bors commented Sep 2, 2020

Uh oh!

tmandry commented Sep 2, 2020

Uh oh!

bors commented Sep 2, 2020

Uh oh!

bors commented Sep 2, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

14 participants