Skip to content

Rollup of 13 pull requests #77606

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 32 commits into from
Oct 6, 2020
Merged

Rollup of 13 pull requests #77606

merged 32 commits into from
Oct 6, 2020

Conversation

JohnTitor
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

poliorcetics and others added 30 commits September 5, 2020 22:37
Replaces simple bool `match`es of the form

    match $expr {
        $pattern => true
        _ => false
    }

and their inverse with invocations of the matches! macro.
…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.
Co-authored-by: Joshua Nelson <joshua@yottadb.com>
Fixes rust-lang#77523

Now that hygiene serialization is implemented, we also need to record
`expansion_that_defined` so that we properly handle a foreign
`SyntaxContext`.
- Move `cfg(doc)` out of `unstable-features`. It's not unstable.
- Remove outdated reference to `everybody_loops`.
- Improve wording in various places
- Give an example of code this allows (and does not allow)
- Link to `cfg(doc)` in `doc(cfg)` documentation. Since one is stable
and the other is not, don't combine them.
- Cleanup wording for `doc(cfg)`
- Incorporate changes from rust-lang#76849
- Mention that `doc(cfg)` is also for features
…anic, r=KodrAus

Add a note about the panic behavior of math operations on time objects

Fixes rust-lang#71226.
Revamp rustdoc docs about documentation using `cfg`

- Move `cfg(doc)` out of `unstable-features`. It's not unstable.
- Remove outdated reference to `everybody_loops`.
- Improve wording in various places
- Give an example of code this allows (and does not allow)
- Link to `cfg(doc)` in `doc(cfg)` documentation. Since one is stable
and the other is not, don't combine them.
- Cleanup wording for `doc(cfg)`
- Incorporate changes from rust-lang#76849
- Mention that `doc(cfg)` is also for features

Addresses rust-lang#76849 (comment).
Obsoletes rust-lang#76849 (I made sure to fix the weird dashes too).
r? @steveklabnik
Reduce boilerplate with the matches! macro

Replaces simple bool `match`es of the form

    match $expr {
        $pattern => true
        _ => false
    }

and their inverse with invocations of the matches! macro.

Limited to rustc_middle for now to get my feet wet.
…, r=pickfire

Add missing examples for MaybeUninit

r? @Dylan-DPC
…lnay

Avoid unchecked casts in net parser

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

r? @dtolnay
…w-override-forbid-in-same-scope, r=petrochenkov

Disallow overriding forbid in same scope

Rebased rust-lang#73379.

Fixes rust-lang#70819.
…yn514

Rename bootstrap/defaults/{config.toml.PROFILE => config.PROFILE.toml}

This allows these files to have okay syntax highlighting in editors, and helps avoid nagging from editors which want to suggest that I install a plugin for `*.library` files to view the `config.toml.library` or whatever.

It's a very minor change.

r?@jyn514
…d-rust-syntax, r=lcnr

Fix rustdoc warnings about invalid Rust syntax
Fix LitKind's byte buffer to use refcounted slice

While working on adding a new lint for clippy (see rust-lang/rust-clippy#6044) for avoiding shared ownership of "mutable buffer" types (such as using `Rc<Vec<T>>` instead of `Rc<[T]>`), I noticed a type exported from rustc_ast and used by clippy gets caught by the lint. This PR fixes the exported type.

This PR includes the actual change to clippy too, but I will open a PR directly against clippy for that part (although it will currently fail to build there).
Hint doc use convert::identity relative link

r? @jyn514
…ic-morse

Fix span for unicode escape suggestion.

If a unicode escape is missing the curly braces, the suggested fix is to add the curly braces, but the span for the fix was incorrect. It was not covering the `\u`, but the suggested text includes the `\u`, causing the resulting fix to be `"\u\u{1234}"`. This changes it so that the span includes the `\u`. An alternate fix would be to remove `\u` from the suggested fix, but I think the error message reads better if the entire escape is included.
…estebank

Record `expansion_that_defined` into crate metadata

Fixes rust-lang#77523

Now that hygiene serialization is implemented, we also need to record
`expansion_that_defined` so that we properly handle a foreign
`SyntaxContext`.
@JohnTitor
Copy link
Member Author

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

@bors
Copy link
Collaborator

bors commented Oct 6, 2020

📌 Commit 552933b has been approved by JohnTitor

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

bors commented Oct 6, 2020

⌛ Testing commit 552933b with merge 5ded394...

@bors
Copy link
Collaborator

bors commented Oct 6, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: JohnTitor
Pushing 5ded394 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 6, 2020
@bors bors merged commit 5ded394 into rust-lang:master Oct 6, 2020
@rustbot rustbot added this to the 1.49.0 milestone Oct 6, 2020
@JohnTitor JohnTitor deleted the rollup-7rgahdt branch October 6, 2020 10:24
# for free to join this conversation on GitHub. Already have an account? # to comment
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
Development

Successfully merging this pull request may close these issues.