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 6 pull requests #90200

Closed
wants to merge 38 commits into from

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

willcrichton and others added 30 commits October 6, 2021 19:44
Move rendering of examples into

Finalize design

Cleanup, rename found -> scraped

Softer yellow

Clean up dead code

Document scrape_examples

More simplification and documentation

Remove extra css

Test
Clean up tidy checks
Simplify toggle UI logic, add workspace root for URLs
Add display name

Fix remaining merge conflicts

Only embed code for items containing examples
Improve styling

Start to clean up code, add comments
Continue migrating JS functionality

Cleanup

Fix compile error

Clean up the diff

Set toggle font to sans-serif
…r I/O issues

Remove repository url

Fix formatting

Fix file_span in print_src

Formatting
Tweak colors

Tabs

New link heading style
* Move call location logic from function constructor to rendering
* Fix issue with macro spans in scraping examples
* Clean up example loading logic

Documentation / newtype for DecorationInfo

Fix line number display

Serialize edition of call site, other small cleanup
Add tests for module-path remapping and scrape example options

Find all crates with a given name
Move test to rustdoc-ui

Fix test writing to wrong directory

Formatting

Fix test

Add FIXME

Remove raw multiline strings
…nks, remove ID from line numbers, fix horizontal scrolling on non-expanded elements
Fix failing test

Add missing backslash

Fix padding issue with horizontal scrollbar
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.
tmiasko and others added 8 commits October 23, 2021 09:26
to ensure that the local qualifs are affected by the state from previous
loop iterations only if the local is kept alive.

The change should be forward compatible with a stricter handling of
indirect assignments, since storage dead invalidates all existing
pointers to the local.
…n514

Scrape code examples from examples/ directory for Rustdoc

Adds support for the functionality described in rust-lang/rfcs#3123

Matching changes to Cargo are here: rust-lang/cargo#9525

Live demo here: https://willcrichton.net/example-analyzer/warp/trait.Filter.html#method.and
…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.
Consider types appearing in const expressions to be invariant

This is an approach to fix rust-lang#80977.
Currently, a type parameter which is only used in a constant expression is considered bivariant and will trigger error E0392 *"parameter T is never used"*.
Here is a short example:

```rust
pub trait Foo {
    const N: usize;
}

struct Bar<T: Foo>([u8; T::N])
where [(); T::N]:;
```
([playgound](https://play.rust-lang.org/?version=nightly&mode=debug&edition=2015&gist=b51a272853f75925e72efc1597478aa5))

While it is possible to silence this error by adding a `PhantomData<T>` field, I think the better solution would be to make `T` invariant.
This would be analogous to the invariance constraints added for associated types.
However, I'm quite new to the compiler and unsure whether this is the right approach.

r? `@varkor` (since you authored rust-lang#60058)
Update the minimum external LLVM to 11

With this change, we'll have stable support for LLVM 11..=13.
For reference, the previous increase to LLVM 10 was rust-lang#83387.

r? `@nagisa` `@nikic`
…thewjasper

Reset qualifs when a storage of a local ends

Reset qualifs when a storage of a local ends to ensure that the local qualifs
are affected by the state from previous loop iterations only if the local is
kept alive.

The change should be forward compatible with a stricter handling of indirect
assignments, since storage dead invalidates all existing pointers to the local.
…me, r=joshtriplett

Add caveat about changing parallelism and function call overhead

As discussed in rust-lang#89670 (comment)

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

@bors r+ p=6 rollup=never

@bors
Copy link
Contributor

bors commented Oct 23, 2021

📌 Commit f99f296 has been approved by matthiaskrgr

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

bors commented Oct 23, 2021

⌛ Testing commit f99f296 with merge d7f1142890ed789b21a77eeb35977ea841fb725e...

@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)
-   --> $DIR/srcloc.rs:11:15
Some tests failed in compiletest suite=ui mode=ui host=aarch64-unknown-linux-gnu target=aarch64-unknown-linux-gnu
+   --> $DIR/srcloc.rs:10:15
3    |
4 LL |         asm!("invalid_instruction");

11    |     ^
12 
13 error: unrecognized instruction mnemonic
---
61 error: unrecognized instruction mnemonic
-   --> $DIR/srcloc.rs:38:14
+   --> $DIR/srcloc.rs:37:14
63    |
64 LL |         asm!(concat!("invalid", "_", "instruction"));

71    |     ^
72 
73 error: unrecognized instruction mnemonic
---
109 error: unrecognized instruction mnemonic
-   --> $DIR/srcloc.rs:62:13
+   --> $DIR/srcloc.rs:61:13
111    |
112 LL |             concat!("invalid", "_", "instruction"),

119    | ^
120 
121 error: unrecognized instruction mnemonic
121 error: unrecognized instruction mnemonic
-   --> $DIR/srcloc.rs:69:13
+   --> $DIR/srcloc.rs:68:13
123    |
124 LL |             concat!("invalid", "_", "instruction"),

131    | ^
132 
133 error: unrecognized instruction mnemonic
---
To only update this specific test, also pass `--test-args asm/aarch64/srcloc.rs`

error: 1 errors occurred comparing output.
status: exit status: 1
command: "/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/asm/aarch64/srcloc.rs" "-Zthreads=1" "--target=aarch64-unknown-linux-gnu" "--error-format" "json" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Zemit-future-incompat-report" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/aarch64-unknown-linux-gnu/test/ui/asm/aarch64/srcloc" "-A" "unused" "-Crpath" "-O" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/aarch64-unknown-linux-gnu/native/rust-test-helpers" "-Ccodegen-units=1" "-L" "/checkout/obj/build/aarch64-unknown-linux-gnu/test/ui/asm/aarch64/srcloc/auxiliary"
------------------------------------------

------------------------------------------
stderr:
stderr:
------------------------------------------
error: unrecognized instruction mnemonic
  --> /checkout/src/test/ui/asm/aarch64/srcloc.rs:10:15
   |
LL |         asm!("invalid_instruction");
   |
note: instantiated into assembly here
note: instantiated into assembly here
  --> <inline asm>:1:2
LL |     invalid_instruction
   |     ^

error: unrecognized instruction mnemonic
error: unrecognized instruction mnemonic
  --> /checkout/src/test/ui/asm/aarch64/srcloc.rs:14:13
   |
LL |             invalid_instruction
   |             ^
   |
note: instantiated into assembly here
  --> <inline asm>:2:13
LL |             invalid_instruction
   |             ^

error: unrecognized instruction mnemonic
error: unrecognized instruction mnemonic
  --> /checkout/src/test/ui/asm/aarch64/srcloc.rs:19:13
   |
LL |             invalid_instruction
   |             ^
   |
note: instantiated into assembly here
  --> <inline asm>:2:13
LL |             invalid_instruction
   |             ^

error: unrecognized instruction mnemonic
error: unrecognized instruction mnemonic
  --> /checkout/src/test/ui/asm/aarch64/srcloc.rs:25:13
   |
LL |             invalid_instruction
   |             ^
   |
note: instantiated into assembly here
  --> <inline asm>:3:13
LL |             invalid_instruction
   |             ^

error: unrecognized instruction mnemonic
error: unrecognized instruction mnemonic
  --> /checkout/src/test/ui/asm/aarch64/srcloc.rs:32:13
   |
LL |             invalid_instruction
   |             ^
   |
note: instantiated into assembly here
  --> <inline asm>:3:13
LL |             invalid_instruction
   |             ^

error: unrecognized instruction mnemonic
error: unrecognized instruction mnemonic
  --> /checkout/src/test/ui/asm/aarch64/srcloc.rs:37:14
   |
LL |         asm!(concat!("invalid", "_", "instruction"));
   |
note: instantiated into assembly here
note: instantiated into assembly here
  --> <inline asm>:1:2
LL |     invalid_instruction
   |     ^

error: unrecognized instruction mnemonic
error: unrecognized instruction mnemonic
  --> /checkout/src/test/ui/asm/aarch64/srcloc.rs:41:14
   |
LL |             "invalid_instruction",
   |              ^
   |
note: instantiated into assembly here
  --> <inline asm>:1:2
LL |     invalid_instruction
   |     ^

error: unrecognized instruction mnemonic
error: unrecognized instruction mnemonic
  --> /checkout/src/test/ui/asm/aarch64/srcloc.rs:47:14
   |
LL |             "invalid_instruction",
   |              ^
   |
note: instantiated into assembly here
  --> <inline asm>:2:1
LL | invalid_instruction
   | ^

error: unrecognized instruction mnemonic
error: unrecognized instruction mnemonic
  --> /checkout/src/test/ui/asm/aarch64/srcloc.rs:54:14
   |
LL |             "invalid_instruction",
   |              ^
   |
note: instantiated into assembly here
  --> <inline asm>:3:1
LL | invalid_instruction
   | ^

error: unrecognized instruction mnemonic
error: unrecognized instruction mnemonic
  --> /checkout/src/test/ui/asm/aarch64/srcloc.rs:61:13
   |
LL |             concat!("invalid", "_", "instruction"),
   |
note: instantiated into assembly here
note: instantiated into assembly here
  --> <inline asm>:2:1
LL | invalid_instruction
   | ^

error: unrecognized instruction mnemonic
error: unrecognized instruction mnemonic
  --> /checkout/src/test/ui/asm/aarch64/srcloc.rs:68:13
   |
LL |             concat!("invalid", "_", "instruction"),
   |
note: instantiated into assembly here
note: instantiated into assembly here
  --> <inline asm>:2:1
LL | invalid_instruction
   | ^

error: unrecognized instruction mnemonic
error: unrecognized instruction mnemonic
  --> /checkout/src/test/ui/asm/aarch64/srcloc.rs:75:14
   |
LL |             "invalid_instruction1",
   |              ^
   |
note: instantiated into assembly here
  --> <inline asm>:1:2
LL |     invalid_instruction1
   |     ^

error: unrecognized instruction mnemonic
error: unrecognized instruction mnemonic
  --> /checkout/src/test/ui/asm/aarch64/srcloc.rs:76:14
   |
LL |             "invalid_instruction2",
   |              ^
   |
note: instantiated into assembly here
  --> <inline asm>:2:1
LL | invalid_instruction2
   | ^

error: unrecognized instruction mnemonic
error: unrecognized instruction mnemonic
  --> /checkout/src/test/ui/asm/aarch64/srcloc.rs:82:13
   |
LL |             concat!(
   |             ^
   |
note: instantiated into assembly here
  --> <inline asm>:1:2
LL |     invalid_instruction1
   |     ^

error: unrecognized instruction mnemonic
error: unrecognized instruction mnemonic
  --> /checkout/src/test/ui/asm/aarch64/srcloc.rs:82:13
   |
LL |             concat!(
   |             ^
   |
note: instantiated into assembly here
  --> <inline asm>:2:1
LL | invalid_instruction2
   | ^

error: unrecognized instruction mnemonic
error: unrecognized instruction mnemonic
  --> /checkout/src/test/ui/asm/aarch64/srcloc.rs:91:13
   |
LL |             concat!(
   |             ^
   |
note: instantiated into assembly here
  --> <inline asm>:1:2
LL |     invalid_instruction1
   |     ^

error: unrecognized instruction mnemonic
error: unrecognized instruction mnemonic
  --> /checkout/src/test/ui/asm/aarch64/srcloc.rs:91:13
   |
LL |             concat!(
   |             ^
   |
note: instantiated into assembly here
  --> <inline asm>:2:1
LL | invalid_instruction2
   | ^

error: unrecognized instruction mnemonic
error: unrecognized instruction mnemonic
  --> /checkout/src/test/ui/asm/aarch64/srcloc.rs:95:13
   |
LL |             concat!(
   |             ^
   |
note: instantiated into assembly here
  --> <inline asm>:3:1
LL | invalid_instruction3
   | ^

error: unrecognized instruction mnemonic
error: unrecognized instruction mnemonic
  --> /checkout/src/test/ui/asm/aarch64/srcloc.rs:95:13
   |
LL |             concat!(
   |             ^
   |
note: instantiated into assembly here
  --> <inline asm>:4:1
LL | invalid_instruction4
   | ^

error: unrecognized instruction mnemonic
error: unrecognized instruction mnemonic
  --> /checkout/src/test/ui/asm/aarch64/srcloc.rs:106:13
   |
LL |             concat!(
   |             ^
   |
note: instantiated into assembly here
  --> <inline asm>:1:2
LL |     invalid_instruction1
   |     ^

error: unrecognized instruction mnemonic
error: unrecognized instruction mnemonic
  --> /checkout/src/test/ui/asm/aarch64/srcloc.rs:106:13
   |
LL |             concat!(
   |             ^
   |
note: instantiated into assembly here
  --> <inline asm>:2:1
LL | invalid_instruction2
   | ^

error: unrecognized instruction mnemonic
error: unrecognized instruction mnemonic
  --> /checkout/src/test/ui/asm/aarch64/srcloc.rs:110:13
   |
LL |             concat!(
   |             ^
   |
note: instantiated into assembly here
  --> <inline asm>:4:1
LL | invalid_instruction3
   | ^

error: unrecognized instruction mnemonic
error: unrecognized instruction mnemonic
  --> /checkout/src/test/ui/asm/aarch64/srcloc.rs:110:13
   |
LL |             concat!(
   |             ^
   |
note: instantiated into assembly here
  --> <inline asm>:5:1
LL | invalid_instruction4
   | ^

error: aborting due to 23 previous errors
---
test result: FAILED. 12186 passed; 1 failed; 144 ignored; 0 measured; 0 filtered out; finished in 143.14s



command did not execute successfully: "/checkout/obj/build/aarch64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/lib/rustlib/aarch64-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/ui" "--build-base" "/checkout/obj/build/aarch64-unknown-linux-gnu/test/ui" "--stage-id" "stage2-aarch64-unknown-linux-gnu" "--suite" "ui" "--mode" "ui" "--target" "aarch64-unknown-linux-gnu" "--host" "aarch64-unknown-linux-gnu" "--llvm-filecheck" "/checkout/obj/build/aarch64-unknown-linux-gnu/llvm/build/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0  -Lnative=/checkout/obj/build/aarch64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0  -Lnative=/checkout/obj/build/aarch64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python3" "--lldb-python" "/usr/bin/python3" "--gdb" "/usr/bin/gdb" "--llvm-version" "13.0.0-rust-1.58.0-nightly" "--llvm-components" "aarch64 aarch64asmparser aarch64codegen aarch64desc aarch64disassembler aarch64info aarch64utils aggressiveinstcombine all all-targets analysis arm armasmparser armcodegen armdesc armdisassembler arminfo armutils asmparser asmprinter avr avrasmparser avrcodegen avrdesc avrdisassembler avrinfo binaryformat bitreader bitstreamreader bitwriter bpf bpfasmparser bpfcodegen bpfdesc bpfdisassembler bpfinfo cfguard codegen core coroutines coverage debuginfocodeview debuginfodwarf debuginfogsym debuginfomsf debuginfopdb demangle dlltooldriver dwarflinker dwp engine executionengine extensions filecheck frontendopenacc frontendopenmp fuzzmutate globalisel hexagon hexagonasmparser hexagoncodegen hexagondesc hexagondisassembler hexagoninfo instcombine instrumentation interfacestub interpreter ipo irreader jitlink libdriver lineeditor linker lto m68k m68kasmparser m68kcodegen m68kdesc m68kdisassembler m68kinfo mc mca mcdisassembler mcjit mcparser mips mipsasmparser mipscodegen mipsdesc mipsdisassembler mipsinfo mirparser msp430 msp430asmparser msp430codegen msp430desc msp430disassembler msp430info native nativecodegen nvptx nvptxcodegen nvptxdesc nvptxinfo objcarcopts object objectyaml option orcjit orcshared orctargetprocess passes powerpc powerpcasmparser powerpccodegen powerpcdesc powerpcdisassembler powerpcinfo profiledata remarks riscv riscvasmparser riscvcodegen riscvdesc riscvdisassembler riscvinfo runtimedyld scalaropts selectiondag sparc sparcasmparser sparccodegen sparcdesc sparcdisassembler sparcinfo support symbolize systemz systemzasmparser systemzcodegen systemzdesc systemzdisassembler systemzinfo tablegen target textapi transformutils vectorize webassembly webassemblyasmparser webassemblycodegen webassemblydesc webassemblydisassembler webassemblyinfo webassemblyutils windowsmanifest x86 x86asmparser x86codegen x86desc x86disassembler x86info xray" "--cc" "" "--cxx" "" "--cflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--channel" "nightly" "--color" "always"


Build completed unsuccessfully in 0:20:29

@bors
Copy link
Contributor

bors commented Oct 23, 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 Oct 23, 2021
@matthiaskrgr matthiaskrgr deleted the rollup-4bebgkj branch November 20, 2021 15:03
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.

10 participants