Skip to content

Rollup of 8 pull requests - #80474

Closed
GuillaumeGomez wants to merge 18 commits into
rust-lang:masterfrom
GuillaumeGomez:rollup-ubyf4oq
Closed

Rollup of 8 pull requests#80474
GuillaumeGomez wants to merge 18 commits into
rust-lang:masterfrom
GuillaumeGomez:rollup-ubyf4oq

Conversation

@GuillaumeGomez

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

pierwilland others added 18 commits December 25, 2020 14:02
Various changes to the `rustc_span` docs, including the following:
- Additions to top-level docs
- Edits to the source_map module docs
- Edits to documentation for `Span` and `SpanData`
- Added intra-docs links
- Documentation for Levenshtein distances
- Fixed missing punctuation
We now lint on code like this:
```rust
fn main() {
fn foo() {};
struct Bar {};
}
```
Previously, this caused warnings in Cargo, so it was disabled.
accesing -> accessing
…r=oli-obk
Lint on redundant trailing semicolon after item
We now lint on code like this:
```rust
fn main() {
fn foo() {};
struct Bar {};
}
```
Previously, this caused warnings in Cargo, so it was disabled.
Edit rustc_span documentation
Various changes to the `rustc_span` docs, including the following:
- Additions to top-level docs
- Edits to the source_map module docs
- Edits to documentation for `Span` and `SpanData`
- Added intra-docs links
- Documentation for Levenshtein distances
- Fixed missing punctuation
…-schievink
Add missing commas to `rustc_ast_pretty::pp` docs
…imulacrum
Add llvm-libunwind change to bootstrap CHANGELOG
From rust-lang#77703.
This doesn't need a `changelog-seen` version bump because the old values aren't accepted anymore, meaning anyone who was using this had to change it already.
r? `@Mark-Simulacrum`
Use Option::map_or instead of open coding it
`@rustbot` modify labels +C-cleanup +T-compiler
Fix typo in ffi-pure.md
accesing -> accessing
…tems-page, r=Nemo157
Use sans-serif font for the "all items" page links
The "all items" pages' links aren't using a sans-serif font unlike the rest of equivalent items in the other module pages. `@Nemo157` reported me this issue so here is the fix!
r? `@Nemo157`
@rustbotrustbot added the rollup A PR which is a rollup label Dec 29, 2020
@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

@bors: r+ p=8

@bors

bors commented Dec 29, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 95857a8 has been approved by GuillaumeGomez

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Dec 29, 2020
@Dylan-DPC-zz

Copy link
Copy Markdown

@bors rollup=never

@bors

bors commented Dec 29, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 95857a8 with merge 40f4012a7aa2fb6e98eb2d7d102e426230b92c70...

@rust-log-analyzer

Copy link
Copy Markdown
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)
Cloning into 'rust-toolstate'...
{"nomicon":"test-pass","rustfmt":"test-pass","embedded-book":"test-pass","rustbook":"test-fail","edition-guide":"test-pass","miri":"test-pass","book":"test-pass","rust-by-example":"test-pass","cargo-miri":"test-fail","rls":"test-pass","reference":"test-pass"}[master 623f8ee] (linux CI update)
1 file changed, 1 insertion(+)
To https://github.com/rust-lang-nursery/rust-toolstate
b79cde7..623f8ee master -> master
Build completed successfully in 0:00:04
Finished dev [unoptimized + debuginfo] target(s) in 0.18s
[TIMING] Assemble { target_compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } } } -- 0.000
[TIMING] StartupObjects { compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }, target: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } } -- 0.000
---
---- compile_test stdout ----
error: failed to compile fixed code
status: exit code: 1
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools-bin/clippy-driver" "tests/ui/match_expr_like_matches_macro.fixed" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/build/clippy-7d596e70088d0ccb/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-7d596e70088d0ccb/out/test_build_base/match_expr_like_matches_macro.stage-id" "--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" "regex=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libregex-e3c044d770c3edb5.rlib" "--extern" "serde=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libserde-3e5755171965ca17.rlib" "--extern" "quote=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libquote-45a3ec2898545ae5.rlib" "--extern" "syn=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libsyn-efc540c81be69f24.rlib" "--extern" "clippy_lints=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libclippy_lints-f8eb452cc9665d35.rlib" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/build/clippy-7d596e70088d0ccb/out/test_build_base/match_expr_like_matches_macro.stage-id.aux"
------------------------------------------
------------------------------------------
stderr:
stderr:
------------------------------------------
{"message":"unnecessary trailing semicolon","code":{"code":"redundant_semicolons","explanation":null},"level":"error","spans":[{"file_name":"tests/ui/match_expr_like_matches_macro.fixed","byte_start":674,"byte_end":675,"line_start":42,"line_end":42,"column_start":6,"column_end":7,"is_primary":true,"text":[{"text":" };","highlight_start":6,"highlight_end":7}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[{"message":"`-D redundant-semicolons` implied by `-D warnings`","code":null,"level":"note","spans":[],"children":[],"rendered":null},{"message":"remove this semicolon","code":null,"level":"help","spans":[{"file_name":"tests/ui/match_expr_like_matches_macro.fixed","byte_start":674,"byte_end":675,"line_start":42,"line_end":42,"column_start":6,"column_end":7,"is_primary":true,"text":[{"text":" };","highlight_start":6,"highlight_end":7}],"label":null,"suggested_replacement":"","suggestion_applicability":"MaybeIncorrect","expansion":null}],"children":[],"rendered":null}],"rendered":"error: unnecessary trailing semicolon\n --> tests/ui/match_expr_like_matches_macro.fixed:42:6\n |\nLL | };\n | ^ help: remove this semicolon\n |\n = note: `-D redundant-semicolons` implied by `-D warnings`\n\n"}
------------------------------------------
thread 'compile_test' panicked at 'Some tests failed', /cargo/registry/src/github.com-1ecc6299db9ec823/compiletest_rs-0.5.0/src/lib.rs:105:22

@bors

bors commented Dec 29, 2020

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@borsbors 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 Dec 29, 2020
@GuillaumeGomez
GuillaumeGomez deleted the rollup-ubyf4oq branch December 29, 2020 19:59
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollupA PR which is a rollupS-waiting-on-reviewStatus: Awaiting review from the assignee but also interested parties.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

12 participants

@GuillaumeGomez@bors@Dylan-DPC-zz@rust-log-analyzer@rustbot@pierwill@Aaron1011@camelid@tmandry@LingMan@eltociear@BlackHoleFox