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 7 pull requests #90049

Closed
wants to merge 19 commits into from

Conversation

GuillaumeGomez
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

nbdd0121 and others added 19 commits September 17, 2021 19:54
std's begin_panic_fmt and core's panic_fmt are duplicates.
Merge them to declutter code and remove a lang item.
The support for runtime multi-threading was removed from LLVM. Calls to
`LLVMStartMultithreaded` became no-ops equivalent to checking if LLVM
was compiled with support for threads http://reviews.llvm.org/D4216.
…tation page

* Rename "type-decl" into "item-decl" to reflect the change of usage
…ans, r=estebank"

This reverts commit 36a1076, reversing
changes made to e1e9319.
The affected crates have had plenty of time to update.
By keeping these as lints rather than making them hard errors,
we ensure that downstream crates will still be able to compile,
even if they transitive depend on broken versions of the affected
crates.

This should hopefully discourage anyone from writing any
new code which relies on the backwards-compatibility behavior.
Headings in the top-doc docblock still get a border-bottom due to a rule
that covers all h2, h3, and h4. Method docblocks are generally h5, and
so don't get a border-bottom anymore.

This fixes a problem where a sub-sub-heading within a method would have
a line that went all the way across the page, creating a division that
made that sub-sub-heading look much more important than it really is.
…esleywiser

Make all proc-macro back-compat lints deny-by-default

The affected crates have had plenty of time to update.
By keeping these as lints rather than making them hard errors,
we ensure that downstream crates will still be able to compile,
even if they transitive depend on broken versions of the affected
crates.

This should hopefully discourage anyone from writing any
new code which relies on the backwards-compatibility behavior.
Deduplicate panic_fmt

std's begin_panic_fmt and core's panic_fmt are duplicates. Merge them to declutter code and remove a lang item.
Cleanup LLVM multi-threading checks

The support for runtime multi-threading was removed from LLVM. Calls to
`LLVMStartMultithreaded` became no-ops equivalent to checking if LLVM
was compiled with support for threads http://reviews.llvm.org/D4216.
Make more `From` impls `const` (libcore)

Adding `const` to `From` implementations in the core. `rustc_const_unstable` attribute is not added to unstable implementations.

Tracking issue: rust-lang#88674

<details>
<summary>Done</summary><div>

- `T` from `T`
- `T` from `!`
- `Option<T>` from `T`
- `Option<&T>` from `&Option<T>`
- `Option<&mut T>` from `&mut Option<T>`
- `Cell<T>` from `T`
- `RefCell<T>` from `T`
- `UnsafeCell<T>` from `T`
- `OnceCell<T>` from `T`
- `Poll<T>` from `T`
- `u32` from `char`
- `u64` from `char`
- `u128` from `char`
- `char` from `u8`
- `AtomicBool` from `bool`
- `AtomicPtr<T>` from `*mut T`
- `AtomicI(bits)` from `i(bits)`
- `AtomicU(bits)` from `u(bits)`
- `i(bits)` from `NonZeroI(bits)`
- `u(bits)` from `NonZeroU(bits)`
- `NonNull<T>` from `Unique<T>`
- `NonNull<T>` from `&T`
- `NonNull<T>` from `&mut T`
- `Unique<T>` from `&mut T`
- `Infallible` from `!`
- `TryIntError` from `!`
- `TryIntError` from `Infallible`
- `TryFromSliceError` from `Infallible`
- `FromResidual for Option<T>`
</div></details>

<details>
<summary>Remaining</summary><dev>

- `NonZero` from `NonZero`
These can't be made const at this time because these use Into::into.
https://github.com/rust-lang/rust/blob/master/library/core/src/convert/num.rs#L393

- `std`, `alloc`
There may still be many implementations that can be made `const`.
</div></details>
… r=jsha

Fix rustdoc UI for very long type names

Fixes rust-lang#89972.

While working on it, I also discovered that when the item name is too long, it also breaks the flow of the page.

To make things right, I also renamed the `type-decl` CSS class into `item-decl` (because this PR also generates it for more than type declarations).

So here are the before/after screenshots:

![Screenshot from 2021-10-18 16-58-03](https://user-images.githubusercontent.com/3050060/137757247-637fcf04-4406-49c6-8a8a-18c2074aacd9.png)
![Screenshot from 2021-10-18 16-58-26](https://user-images.githubusercontent.com/3050060/137757252-17935e63-53b3-449f-a535-7be91ff0e257.png)

![Screenshot from 2021-10-18 16-58-07](https://user-images.githubusercontent.com/3050060/137757278-8b12e348-2980-4fc4-8853-bef99d58981f.png)
![Screenshot from 2021-10-18 16-58-28](https://user-images.githubusercontent.com/3050060/137757282-534a0e1b-3016-49ba-b3ac-e45bdb9035cb.png)

r? `@jsha`
Revert rust-lang#86011 to fix an incorrect bound check

This reverts commit 36a1076, reversing
changes made to e1e9319.

Fixes rust-lang#89935
r? `@estebank`
Remove border-bottom from most docblocks.

Headings in the top-doc docblock still get a border-bottom due to a rule
that covers all h2, h3, and h4. Method docblocks are generally h5, and
so don't get a border-bottom anymore.

This fixes a problem where a sub-sub-heading within a method would have
a line that went all the way across the page, creating a division that
made that sub-sub-heading look much more important than it really is.

Fixes rust-lang#90033

Demo at https://jacob.hoffman-andrews.com/rust/less-rule/std/string/struct.String.html

r? `@GuillaumeGomez`
@rustbot rustbot added the rollup A PR which is a rollup label Oct 19, 2021
@GuillaumeGomez
Copy link
Member Author

@bors: r+ p=7 rollup=never

@bors
Copy link
Contributor

bors commented Oct 19, 2021

📌 Commit 5b5d057 has been approved by GuillaumeGomez

@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 19, 2021
@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)
  IMAGE: x86_64-gnu-tools
##[endgroup]
From https://github.com/rust-lang/rust
 * branch              master     -> FETCH_HEAD
Searching for toolstate changes between 2f22e63cc4b61d2f42b92eee11480a4f93dc2771 and f8546e9a1ba6e915b4381521c8ae7650c40a3723
Rustdoc was updated
##[group]Run src/ci/scripts/verify-channel.sh
src/ci/scripts/verify-channel.sh
shell: /bin/bash --noprofile --norc -e -o pipefail {0}
env:
---

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

 error: only a `panic!` in `if`-then statement
    |
    |
 LL | /     if !a.is_empty() {
 LL | |         panic!("qaqaq{:?}", a);
 LL | |     }
-   | |_____^ help: try: `assert!(a.is_empty(), "qaqaq{:?}", a);`
error: test failed, to rerun pass '--test compile-test'
+   | |_____^ help: try: `assert!(a.is_empty(), $crate::const_format_args!($fmt, $($arg)+));`
    |
    = note: `-D clippy::if-then-panic` implied by `-D warnings`
 
 error: only a `panic!` in `if`-then statement
    |
    |
 LL | /     if !a.is_empty() {
 LL | |         panic!("qwqwq");
 LL | |     }
    | |_____^ help: try: `assert!(a.is_empty(), "qwqwq");`
 
 error: only a `panic!` in `if`-then statement
    |
    |
 LL | /     if b.is_empty() {
 LL | |         panic!("panic1");
 LL | |     }
    | |_____^ help: try: `assert!(!b.is_empty(), "panic1");`
 
 error: only a `panic!` in `if`-then statement
    |
    |
 LL | /     if b.is_empty() && a.is_empty() {
 LL | |         panic!("panic2");
 LL | |     }
    | |_____^ help: try: `assert!(!(b.is_empty() && a.is_empty()), "panic2");`
 
 error: only a `panic!` in `if`-then statement
    |
    |
 LL | /     if a.is_empty() && !b.is_empty() {
 LL | |         panic!("panic3");
 LL | |     }
    | |_____^ help: try: `assert!(!(a.is_empty() && !b.is_empty()), "panic3");`
 
 error: only a `panic!` in `if`-then statement
    |
    |
 LL | /     if b.is_empty() || a.is_empty() {
 LL | |         panic!("panic4");
 LL | |     }
    | |_____^ help: try: `assert!(!(b.is_empty() || a.is_empty()), "panic4");`
 
 error: only a `panic!` in `if`-then statement
    |
    |
 LL | /     if a.is_empty() || !b.is_empty() {
 LL | |         panic!("panic5");
 LL | |     }
    | |_____^ help: try: `assert!(!(a.is_empty() || !b.is_empty()), "panic5");`
 error: aborting due to 7 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/test/if_then_panic.stage-id.stderr
diff of fixed:

 // run-rustfix
 #![warn(clippy::if_then_panic)]
 fn main() {
 fn main() {
     let a = vec![1, 2, 3];
     let c = Some(2);
     if !a.is_empty()
         && a.len() == 3
         && c != None
         && !a.is_empty()
         && a.len() == 3
         && !a.is_empty()
         && a.len() == 3
         && !a.is_empty()
         && a.len() == 3
     {
         panic!("qaqaq{:?}", a);
     }
-    assert!(a.is_empty(), "qaqaq{:?}", a);
+    assert!(a.is_empty(), $crate::const_format_args!($fmt, $($arg)+));
     assert!(a.is_empty(), "qwqwq");
     if a.len() == 3 {
         println!("qwq");
         println!("qwq");
         println!("qwq");
     }
     if let Some(b) = c {
         panic!("orz {}", b);
     }
     if a.len() == 3 {
         panic!("qaqaq");
     } else {
         println!("qwq");
     }
     let b = vec![1, 2, 3];
     assert!(!b.is_empty(), "panic1");
     assert!(!(b.is_empty() && a.is_empty()), "panic2");
     assert!(!(a.is_empty() && !b.is_empty()), "panic3");
     assert!(!(b.is_empty() || a.is_empty()), "panic4");
     assert!(!(a.is_empty() || !b.is_empty()), "panic5");
 

The actual fixed differed from the expected fixed.
The actual fixed differed from the expected fixed.
Actual fixed saved to /checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/test/if_then_panic.stage-id.fixed
To only update this specific test, also pass `--test-args if_then_panic.rs`

error: 2 errors occurred comparing output.
status: exit status: 1
status: exit status: 1
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/clippy-driver" "tests/ui/if_then_panic.rs" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/test" "--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/test/if_then_panic.stage-id" "-A" "unused" "--emit=metadata" "-Dwarnings" "-Zui-testing" "-L" "dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps" "-L" "dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/release/deps" "--extern" "regex=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libregex-392b40a2759b0504.rlib" "--extern" "itertools=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libitertools-b0f19a5fad83a10b.rlib" "--extern" "quote=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libquote-c6bd037ba33baa25.rlib" "--extern" "syn=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libsyn-2c42e7af51424ce5.rlib" "--extern" "derive_new=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/release/deps/libderive_new-ea1db0c41efed0d6.so" "--extern" "serde_derive=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/release/deps/libserde_derive-8bd56d0234290b82.so" "--extern" "serde=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libserde-89222f6e0d369b36.rlib" "--extern" "if_chain=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libif_chain-b3e76e8f62643cc6.rlib" "--extern" "clippy_utils=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libclippy_utils-bc2b0c8a9dcb9fb3.rlib" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/test/if_then_panic.stage-id.aux"
------------------------------------------

------------------------------------------
stderr:
stderr:
------------------------------------------
{"message":"only a `panic!` in `if`-then statement","code":{"code":"clippy::if_then_panic","explanation":null},"level":"error","spans":[{"file_name":"tests/ui/if_then_panic.rs","byte_start":369,"byte_end":425,"line_start":19,"line_end":21,"column_start":5,"column_end":6,"is_primary":true,"text":[{"text":"    if !a.is_empty() {","highlight_start":5,"highlight_end":23},{"text":"        panic!(\"qaqaq{:?}\", a);","highlight_start":1,"highlight_end":32},{"text":"    }","highlight_start":1,"highlight_end":6}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[{"message":"`-D clippy::if-then-panic` implied by `-D warnings`","code":null,"level":"note","spans":[],"children":[],"rendered":null},{"message":"try","code":null,"level":"help","spans":[{"file_name":"tests/ui/if_then_panic.rs","byte_start":369,"byte_end":425,"line_start":19,"line_end":21,"column_start":5,"column_end":6,"is_primary":true,"text":[{"text":"    if !a.is_empty() {","highlight_start":5,"highlight_end":23},{"text":"        panic!(\"qaqaq{:?}\", a);","highlight_start":1,"highlight_end":32},{"text":"    }","highlight_start":1,"highlight_end":6}],"label":null,"suggested_replacement":"assert!(a.is_empty(), $crate::const_format_args!($fmt, $($arg)+));","suggestion_applicability":"MachineApplicable","expansion":null}],"children":[],"rendered":null}],"rendered":"error: only a `panic!` in `if`-then statement\n  --> tests/ui/if_then_panic.rs:19:5\n   |\nLL | /     if !a.is_empty() {\nLL | |         panic!(\"qaqaq{:?}\", a);\nLL | |     }\n   | |_____^ help: try: `assert!(a.is_empty(), $crate::const_format_args!($fmt, $($arg)+));`\n   |\n   = note: `-D clippy::if-then-panic` implied by `-D warnings`\n\n"}
{"message":"only a `panic!` in `if`-then statement","code":{"code":"clippy::if_then_panic","explanation":null},"level":"error","spans":[{"file_name":"tests/ui/if_then_panic.rs","byte_start":430,"byte_end":479,"line_start":22,"line_end":24,"column_start":5,"column_end":6,"is_primary":true,"text":[{"text":"    if !a.is_empty() {","highlight_start":5,"highlight_end":23},{"text":"        panic!(\"qwqwq\");","highlight_start":1,"highlight_end":25},{"text":"    }","highlight_start":1,"highlight_end":6}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[{"message":"try","code":null,"level":"help","spans":[{"file_name":"tests/ui/if_then_panic.rs","byte_start":430,"byte_end":479,"line_start":22,"line_end":24,"column_start":5,"column_end":6,"is_primary":true,"text":[{"text":"    if !a.is_empty() {","highlight_start":5,"highlight_end":23},{"text":"        panic!(\"qwqwq\");","highlight_start":1,"highlight_end":25},{"text":"    }","highlight_start":1,"highlight_end":6}],"label":null,"suggested_replacement":"assert!(a.is_empty(), \"qwqwq\");","suggestion_applicability":"MachineApplicable","expansion":null}],"children":[],"rendered":null}],"rendered":"error: only a `panic!` in `if`-then statement\n  --> tests/ui/if_then_panic.rs:22:5\n   |\nLL | /     if !a.is_empty() {\nLL | |         panic!(\"qwqwq\");\nLL | |     }\n   | |_____^ help: try: `assert!(a.is_empty(), \"qwqwq\");`\n\n"}
{"message":"only a `panic!` in `if`-then statement","code":{"code":"clippy::if_then_panic","explanation":null},"level":"error","spans":[{"file_name":"tests/ui/if_then_panic.rs","byte_start":765,"byte_end":814,"line_start":39,"line_end":41,"column_start":5,"column_end":6,"is_primary":true,"text":[{"text":"    if b.is_empty() {","highlight_start":5,"highlight_end":22},{"text":"        panic!(\"panic1\");","highlight_start":1,"highlight_end":26},{"text":"    }","highlight_start":1,"highlight_end":6}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[{"message":"try","code":null,"level":"help","spans":[{"file_name":"tests/ui/if_then_panic.rs","byte_start":765,"byte_end":814,"line_start":39,"line_end":41,"column_start":5,"column_end":6,"is_primary":true,"text":[{"text":"    if b.is_empty() {","highlight_start":5,"highlight_end":22},{"text":"        panic!(\"panic1\");","highlight_start":1,"highlight_end":26},{"text":"    }","highlight_start":1,"highlight_end":6}],"label":null,"suggested_replacement":"assert!(!b.is_empty(), \"panic1\");","suggestion_applicability":"MachineApplicable","expansion":null}],"children":[],"rendered":null}],"rendered":"error: only a `panic!` in `if`-then statement\n  --> tests/ui/if_then_panic.rs:39:5\n   |\nLL | /     if b.is_empty() {\nLL | |         panic!(\"panic1\");\nLL | |     }\n   | |_____^ help: try: `assert!(!b.is_empty(), \"panic1\");`\n\n"}
{"message":"only a `panic!` in `if`-then statement","code":{"code":"clippy::if_then_panic","explanation":null},"level":"error","spans":[{"file_name":"tests/ui/if_then_panic.rs","byte_start":819,"byte_end":884,"line_start":42,"line_end":44,"column_start":5,"column_end":6,"is_primary":true,"text":[{"text":"    if b.is_empty() && a.is_empty() {","highlight_start":5,"highlight_end":38},{"text":"        panic!(\"panic2\");","highlight_start":1,"highlight_end":26},{"text":"    }","highlight_start":1,"highlight_end":6}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[{"message":"try","code":null,"level":"help","spans":[{"file_name":"tests/ui/if_then_panic.rs","byte_start":819,"byte_end":884,"line_start":42,"line_end":44,"column_start":5,"column_end":6,"is_primary":true,"text":[{"text":"    if b.is_empty() && a.is_empty() {","highlight_start":5,"highlight_end":38},{"text":"        panic!(\"panic2\");","highlight_start":1,"highlight_end":26},{"text":"    }","highlight_start":1,"highlight_end":6}],"label":null,"suggested_replacement":"assert!(!(b.is_empty() && a.is_empty()), \"panic2\");","suggestion_applicability":"MachineApplicable","expansion":null}],"children":[],"rendered":null}],"rendered":"error: only a `panic!` in `if`-then statement\n  --> tests/ui/if_then_panic.rs:42:5\n   |\nLL | /     if b.is_empty() && a.is_empty() {\nLL | |         panic!(\"panic2\");\nLL | |     }\n   | |_____^ help: try: `assert!(!(b.is_empty() && a.is_empty()), \"panic2\");`\n\n"}
{"message":"only a `panic!` in `if`-then statement","code":{"code":"clippy::if_then_panic","explanation":null},"level":"error","spans":[{"file_name":"tests/ui/if_then_panic.rs","byte_start":889,"byte_end":955,"line_start":45,"line_end":47,"column_start":5,"column_end":6,"is_primary":true,"text":[{"text":"    if a.is_empty() && !b.is_empty() {","highlight_start":5,"highlight_end":39},{"text":"        panic!(\"panic3\");","highlight_start":1,"highlight_end":26},{"text":"    }","highlight_start":1,"highlight_end":6}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[{"message":"try","code":null,"level":"help","spans":[{"file_name":"tests/ui/if_then_panic.rs","byte_start":889,"byte_end":955,"line_start":45,"line_end":47,"column_start":5,"column_end":6,"is_primary":true,"text":[{"text":"    if a.is_empty() && !b.is_empty() {","highlight_start":5,"highlight_end":39},{"text":"        panic!(\"panic3\");","highlight_start":1,"highlight_end":26},{"text":"    }","highlight_start":1,"highlight_end":6}],"label":null,"suggested_replacement":"assert!(!(a.is_empty() && !b.is_empty()), \"panic3\");","suggestion_applicability":"MachineApplicable","expansion":null}],"children":[],"rendered":null}],"rendered":"error: only a `panic!` in `if`-then statement\n  --> tests/ui/if_then_panic.rs:45:5\n   |\nLL | /     if a.is_empty() && !b.is_empty() {\nLL | |         panic!(\"panic3\");\nLL | |     }\n   | |_____^ help: try: `assert!(!(a.is_empty() && !b.is_empty()), \"panic3\");`\n\n"}
{"message":"only a `panic!` in `if`-then statement","code":{"code":"clippy::if_then_panic","explanation":null},"level":"error","spans":[{"file_name":"tests/ui/if_then_panic.rs","byte_start":960,"byte_end":1025,"line_start":48,"line_end":50,"column_start":5,"column_end":6,"is_primary":true,"text":[{"text":"    if b.is_empty() || a.is_empty() {","highlight_start":5,"highlight_end":38},{"text":"        panic!(\"panic4\");","highlight_start":1,"highlight_end":26},{"text":"    }","highlight_start":1,"highlight_end":6}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[{"message":"try","code":null,"level":"help","spans":[{"file_name":"tests/ui/if_then_panic.rs","byte_start":960,"byte_end":1025,"line_start":48,"line_end":50,"column_start":5,"column_end":6,"is_primary":true,"text":[{"text":"    if b.is_empty() || a.is_empty() {","highlight_start":5,"highlight_end":38},{"text":"        panic!(\"panic4\");","highlight_start":1,"highlight_end":26},{"text":"    }","highlight_start":1,"highlight_end":6}],"label":null,"suggested_replacement":"assert!(!(b.is_empty() || a.is_empty()), \"panic4\");","suggestion_applicability":"MachineApplicable","expansion":null}],"children":[],"rendered":null}],"rendered":"error: only a `panic!` in `if`-then statement\n  --> tests/ui/if_then_panic.rs:48:5\n   |\nLL | /     if b.is_empty() || a.is_empty() {\nLL | |         panic!(\"panic4\");\nLL | |     }\n   | |_____^ help: try: `assert!(!(b.is_empty() || a.is_empty()), \"panic4\");`\n\n"}
{"message":"only a `panic!` in `if`-then statement","code":{"code":"clippy::if_then_panic","explanation":null},"level":"error","spans":[{"file_name":"tests/ui/if_then_panic.rs","byte_start":1030,"byte_end":1096,"line_start":51,"line_end":53,"column_start":5,"column_end":6,"is_primary":true,"text":[{"text":"    if a.is_empty() || !b.is_empty() {","highlight_start":5,"highlight_end":39},{"text":"        panic!(\"panic5\");","highlight_start":1,"highlight_end":26},{"text":"    }","highlight_start":1,"highlight_end":6}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[{"message":"try","code":null,"level":"help","spans":[{"file_name":"tests/ui/if_then_panic.rs","byte_start":1030,"byte_end":1096,"line_start":51,"line_end":53,"column_start":5,"column_end":6,"is_primary":true,"text":[{"text":"    if a.is_empty() || !b.is_empty() {","highlight_start":5,"highlight_end":39},{"text":"        panic!(\"panic5\");","highlight_start":1,"highlight_end":26},{"text":"    }","highlight_start":1,"highlight_end":6}],"label":null,"suggested_replacement":"assert!(!(a.is_empty() || !b.is_empty()), \"panic5\");","suggestion_applicability":"MachineApplicable","expansion":null}],"children":[],"rendered":null}],"rendered":"error: only a `panic!` in `if`-then statement\n  --> tests/ui/if_then_panic.rs:51:5\n   |\nLL | /     if a.is_empty() || !b.is_empty() {\nLL | |         panic!(\"panic5\");\nLL | |     }\n   | |_____^ help: try: `assert!(!(a.is_empty() || !b.is_empty()), \"panic5\");`\n\n"}

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

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

@bors
Copy link
Contributor

bors commented Oct 19, 2021

⌛ Testing commit 5b5d057 with merge d04bfbc87a20649fc4da6b0829e027e1f092a423...

@GuillaumeGomez
Copy link
Member Author

@bors: r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 19, 2021
@GuillaumeGomez
Copy link
Member Author

@bors: retry

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 19, 2021
@GuillaumeGomez
Copy link
Member Author

@bors: r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 19, 2021
@GuillaumeGomez GuillaumeGomez deleted the rollup-ovvzh2y branch October 19, 2021 11:20
@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

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

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-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants