Rollup of 5 pull requests #84258

jyn514 · 2021-04-16T20:13:51Z

Successful merges:

Do not ignore path segments in the middle in #[allow]/#[warn]/#[deny]/#[forbid] attributes #84064 (Do not ignore path segments in the middle in #[allow]/#[warn]/#[deny]/#[forbid] attributes)
rustdoc: clean up and test macro visibility print #84074 (rustdoc: clean up and test macro visibility print)
Builtin derive macros: fix error with const generics default #84243 (Builtin derive macros: fix error with const generics default)
fix incomplete diagnostic notes when closure returns conflicting for genric type #84244 (fix incomplete diagnostic notes when closure returns conflicting for genric type)
rustdoc: get rid of unused path printing code #84246 (rustdoc: get rid of unused path printing code)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

…deny]`/`#[forbid]` attributes

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.

jyn514 · 2021-04-16T20:14:36Z

@bors r+ rollup=never p=5

bors · 2021-04-16T20:14:37Z

📌 Commit 4099ecf has been approved by jyn514

bors · 2021-04-16T22:15:45Z

⌛ Testing commit 4099ecf with merge ad4c00b327fcbbd5ab7f2034921dec8a4b75d3d0...

rust-log-analyzer · 2021-04-16T22:55:26Z

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.heygears.com-1ecc6299db9ec823/compiletest_rs-0.6.0/src/lib.rs:105:22

bors · 2021-04-16T23:00:20Z

💔 Test failed - checks-actions

ghost · 2021-04-17T07:56:35Z

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

hyd-dev and others added 10 commits April 11, 2021 01:11

Do not ignore path segments in the middle in #[allow]/#[warn]/`#[…

56fe372

…deny]`/`#[forbid]` attributes

rustdoc: clean up and test macro visibility print

2dfd0bf

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.

builtin derive macros: fix error with const generics default

9ecfae4

fix reporting return type in some cases

af90cac

rustdoc: get rid of unused path printing code

6109cee

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.

Rollup merge of rust-lang#84064 - hyd-dev:unknown-lints, r=petrochenkov

5646f58

Do not ignore path segments in the middle in `#[allow]`/`#[warn]`/`#[deny]`/`#[forbid]` attributes Fixes rust-lang#83477.

Rollup merge of rust-lang#84244 - ABouttefeux:closure-return-conflict…

0946b64

…-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

rustbot added the rollup A PR which is a rollup label Apr 16, 2021

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

jyn514 mentioned this pull request Apr 16, 2021

rustdoc: use more precise relative URLs #83237

Merged

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

jyn514 closed this Apr 17, 2021

jyn514 deleted the rollup-pkm8mok branch April 17, 2021 14:31

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 5 pull requests #84258

Rollup of 5 pull requests #84258

jyn514 commented Apr 16, 2021

jyn514 commented Apr 16, 2021

bors commented Apr 16, 2021

bors commented Apr 16, 2021

rust-log-analyzer commented Apr 16, 2021

bors commented Apr 16, 2021

ghost commented Apr 17, 2021

Rollup of 5 pull requests #84258

Rollup of 5 pull requests #84258

Conversation

jyn514 commented Apr 16, 2021

jyn514 commented Apr 16, 2021

bors commented Apr 16, 2021

bors commented Apr 16, 2021

rust-log-analyzer commented Apr 16, 2021

bors commented Apr 16, 2021

ghost commented Apr 17, 2021