Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Rollup of 12 pull requests #81165

Merged
merged 100 commits into from
Jan 18, 2021
Merged

Rollup of 12 pull requests #81165

merged 100 commits into from
Jan 18, 2021

Conversation

KodrAus
Copy link
Contributor

@KodrAus KodrAus commented Jan 18, 2021

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

flip1995 and others added 30 commits December 17, 2020 21:44
The core issue was the usage of `reference_file_path.file_name()`, which
provided a non-existent path if the file to be updated was in a
subdirectory.

Instead we have to provide the whole path after 'tests/ui/' as the
'filename'. This part of the path is called `test_name` in the code now.
This should make the code slightly more understandable
fixes #6522

changelog: field_reassign_with_default: don't expand macros in lint suggestion (#6522)
Update CHANGELOG for Rust 1.50

changelog: none

r? `@flip1995`
field_reassign_with_default: don't expand macros in suggestion

fixes #6522

changelog: field_reassign_with_default: don't expand macros in lint suggestion (#6522)
Ensure `Copy` exception in trait definition for `wrong_self_conventio…

Add a test case to ensure `Copy` exception is preserved also in trait definition, when passing `self` by value.

Follow up of #6316

changelog: none
Fix blessing of test output in subdirectories

The core issue was the usage of `reference_file_path.file_name()`, which
provided a non-existent path if the file to be updated was in a
subdirectory.

Instead we have to provide the whole path after 'tests/ui/' as the
'filename'. This part of the path is called `test_name` in the code now.

changelog: none
… enable/disable it particularly

This splits up clippy::collapsible_if into collapsible_if for
if x {
  if y { }
}
=>
if x && y { }

and collapsible_else_if for

if x {
} else {
 if y { }
}

=>
if x {

} else if y {

}

so that we can lint for only the latter but not the first if we desire.

changelog: collapsible_if: split up linting for if x {} else { if y {} } into collapsible_else_if lint
collapsible_if: split collapsible_else_if into its own lint so we can enable/disable it particularly

This splits up clippy::collapsible_if into collapsible_if for
if x {
  if y { }
}
=>
if x && y { }

and collapsible_else_if for

if x {
} else {
 if y { }
}

=>
if x {

} else if y {

}

so that we can lint for only the latter but not the first if we desire.

changelog: collapsible_if: split up linting for if x {} else { if y {} } into collapsible_else_if lint
Needless Question Mark Lint

Fixes #6410, i.e the needless question mark lint

changelog: [`needless_question_mark`] New lint
Add ui-internal to cargo dev bless

changelog: internal
osa1 and others added 20 commits January 17, 2021 17:40
Fixed space
Before:

```
thread 'rustc' panicked at 'attempt to read from stolen value', /home/joshua/rustc/compiler/rustc_data_structures/src/steal.rs:43:15
```

After:

```
thread 'rustc' panicked at 'attempt to steal from stolen value', compiler/rustc_mir/src/transform/mod.rs:423:25
```
Link to RFC 401 and add missing punctuation.
Signed-off-by: wcampbell <wcampbell1995@gmail.com>
Update Clippy

Biweekly Clippy update

r? ``@Manishearth``
rustc_parse_format: Fix character indices in find_skips

Fixes #81006
Initialize a few variables directly

Currently they are declared as `mut`, get initialized to a default value, and
then possibly overwritten.

By initializing to the final value directly, they don't need to be `mut` and
it's clear that they don't get mutated elsewhere later on.
ConstProp: Copy body span instead of querying it
Avoid logging the whole MIR body in SimplifyCfg
Add track_caller to .steal()

Before:

```
thread 'rustc' panicked at 'attempt to read from stolen value', /home/joshua/rustc/compiler/rustc_data_structures/src/steal.rs:43:15
```

After:

```
thread 'rustc' panicked at 'attempt to steal from stolen value', compiler/rustc_mir/src/transform/mod.rs:423:25
```

r? `@lcnr`
validation test: turn some const_err back into validation failures

This resolves the problem I raised at #78407 (comment).
r? `@oli-obk`
Edit rustc_middle::ty::cast docs

Link to RFC 401 and add missing punctuation.
…onas-schievink

Replace let Some(..) = with .is_some()
Remove unused linkcheck exceptions

Found while working on deadlinks/cargo-deadlinks#133.

r? `@Manishearth`
@rustbot rustbot added the rollup A PR which is a rollup label Jan 18, 2021
@KodrAus
Copy link
Contributor Author

KodrAus commented Jan 18, 2021

@bors r+ p=12 rollup=never

@bors
Copy link
Contributor

bors commented Jan 18, 2021

📌 Commit 33d184b has been approved by KodrAus

@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 Jan 18, 2021
@bors
Copy link
Contributor

bors commented Jan 18, 2021

⌛ Testing commit 33d184b with merge 5e91c4e...

@bors
Copy link
Contributor

bors commented Jan 18, 2021

☀️ Test successful - checks-actions
Approved by: KodrAus
Pushing 5e91c4e to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 18, 2021
@bors bors merged commit 5e91c4e into rust-lang:master Jan 18, 2021
@rustbot rustbot added this to the 1.51.0 milestone Jan 18, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in 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.