Skip to content

Rollup of 5 pull requests - #94200

Closed
Manishearth wants to merge 16 commits into
rust-lang:masterfrom
Manishearth:rollup-qzm0u15
Closed

Rollup of 5 pull requests#94200
Manishearth wants to merge 16 commits into
rust-lang:masterfrom
Manishearth:rollup-qzm0u15

Conversation

@Manishearth

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

cjgillotand others added 16 commits February 16, 2022 18:41
…me in run_cargo
Metadata::modified works in all platforms supported by the filetime
crate. This changes brings rustbuild a tiny bit closer towards dropping
the filetime dependency.
Some improvements to the async docs
The goal here is to make the docs overall a little bit more comprehensive and add more links between the things.
One thing that's not working yet is the links to the keywords. Somehow I couldn't get them to work.
r? ```@GuillaumeGomez``` do you know how I could get the keyword links to work?
Ensure stability directives are checked in all cases
Split off rust-lang#93017
Stability and deprecation were not checked in all cases, for instance if a type error happened.
This PR moves the check earlier in the pipeline to ensure the errors are emitted in all cases.
r? ```@lcnr```
Gracefully handle non-UTF-8 string slices when pretty printing
Fixesrust-lang#78520.
…RalfJung
Implement LowerHex on Scalar to clean up their display in rustdoc
Follow-up of rust-lang#94091.
r? ```@RalfJung```
…crum
Use Metadata::modified instead of FileTime::from_last_modification_ti…
…me in run_cargo
Metadata::modified works in all platforms supported by the filetime
crate. This changes brings rustbuild a tiny bit closer towards dropping
the filetime dependency.
@rustbotrustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Feb 21, 2022
@Manishearth

Copy link
Copy Markdown
MemberAuthor

@bors r+ p=5 rollup=never

@bors

bors commented Feb 21, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit 447707e has been approved by Manishearth

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Feb 21, 2022
@bors

bors commented Feb 21, 2022

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 447707e with merge 5ea8a669b19d928b4b38d8c335aece2804c0cbde...

@bors

bors commented Feb 21, 2022

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 Feb 21, 2022
@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

The job dist-i586-gnu-i586-i686-musl failed! Check out the build log: (web)(plain)

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

---- [ui] ui/feature-gates/gated-bad-feature.rs stdout ----
diff of stderr:
28 LL | #![feature = "foo"]
29 | ^^^^^^^^^^^^^^^^^^^ help: must be of the form: `#![feature(name1, name1, ...)]`
30 - error[E0635]: unknown feature `foo_bar_baz`
- --> $DIR/gated-bad-feature.rs:1:12
- |
- LL | #![feature(foo_bar_baz, foo(bar), foo = "baz", foo)]
- 37 error[E0635]: unknown feature `foo`
38 --> $DIR/gated-bad-feature.rs:1:48
39 |
39 |
40 LL | #![feature(foo_bar_baz, foo(bar), foo = "baz", foo)]
+ + + error[E0635]: unknown feature `foo_bar_baz`
+ --> $DIR/gated-bad-feature.rs:1:12
+ |
+ LL | #![feature(foo_bar_baz, foo(bar), foo = "baz", foo)]
42 43 error: aborting due to 7 previous errors
44 ---
To only update this specific test, also pass `--test-args feature-gates/gated-bad-feature.rs`
error: 1 errors occurred comparing output.
status: exit status: 1
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/feature-gates/gated-bad-feature.rs" "-Zthreads=1" "--target=i586-unknown-linux-gnu" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/feature-gates/gated-bad-feature" "-A" "unused" "-Crpath" "-O" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/i586-unknown-linux-gnu/native/rust-test-helpers" "-Clinker=cc" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/feature-gates/gated-bad-feature/auxiliary"
------------------------------------------
------------------------------------------
stderr:
stderr:
------------------------------------------
error[E0556]: malformed `feature` attribute input
--> /checkout/src/test/ui/feature-gates/gated-bad-feature.rs:1:25
|
LL | #![feature(foo_bar_baz, foo(bar), foo = "baz", foo)]
| ^^^^^^^^ help: expected just one word: `foo`
error[E0556]: malformed `feature` attribute input
--> /checkout/src/test/ui/feature-gates/gated-bad-feature.rs:1:35
|
|
LL | #![feature(foo_bar_baz, foo(bar), foo = "baz", foo)]
| ^^^^^^^^^^^ help: expected just one word: `foo`
error[E0557]: feature has been removed
--> /checkout/src/test/ui/feature-gates/gated-bad-feature.rs:8:12
|
|
LL | #![feature(test_removed_feature)] //~ ERROR: feature has been removed
error: malformed `feature` attribute input
--> /checkout/src/test/ui/feature-gates/gated-bad-feature.rs:6:1
|
|
LL | #![feature] //~ ERROR malformed `feature` attribute
| ^^^^^^^^^^^ help: must be of the form: `#![feature(name1, name1, ...)]`
error: malformed `feature` attribute input
--> /checkout/src/test/ui/feature-gates/gated-bad-feature.rs:7:1
|
|
LL | #![feature = "foo"] //~ ERROR malformed `feature` attribute
| ^^^^^^^^^^^^^^^^^^^ help: must be of the form: `#![feature(name1, name1, ...)]`
error[E0635]: unknown feature `foo`
--> /checkout/src/test/ui/feature-gates/gated-bad-feature.rs:1:48
|
|
LL | #![feature(foo_bar_baz, foo(bar), foo = "baz", foo)]
error[E0635]: unknown feature `foo_bar_baz`
|
|
LL | #![feature(foo_bar_baz, foo(bar), foo = "baz", foo)]
error: aborting due to 7 previous errors
Some errors have detailed explanations: E0556, E0557, E0635.

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.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants

@Manishearth@bors@rust-log-analyzer@rustbot@cjgillot@tmiasko@GuillaumeGomez@bjorn3