Rollup of 7 pull requests by GuillaumeGomez · Pull Request #88913 · rust-lang/rust

GuillaumeGomez · 2021-09-13T18:59:33Z

Successful merges:

Add links for primitives in "jump to definition" feature #88033 (Add links for primitives in "jump to definition" feature)
Make UnsafeCell::get_mut const #88722 (Make UnsafeCell::get_mut const)
Tokenize emoji as if they were valid identifiers #88781 (Tokenize emoji as if they were valid identifiers )
Fix duplicate bounds for const_trait_impl #88851 (Fix duplicate bounds for const_trait_impl)
interpreter PointerArithmetic: use new Size helper methods #88859 (interpreter PointerArithmetic: use new Size helper methods)
Fix jump def background #88885 (Fix jump def background)
Reduce possibility of flaky tests #88896 (Reduce possibility of flaky tests)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

In the lexer, consider emojis to be valid identifiers and reject them later to avoid knock down parse errors.

* Add test for jump-to-def links background color

…e, r=jyn514 Add links for primitives in "jump to definition" feature Follow-up of rust-lang#84176. I created a function `primitive_from_str` which is code that was originally in `collect_intra_doc_links::resolve_primitive` to prevent code duplication. I also created the `primitive_link_url` function which is somewhat similar to `primitive_link` but too much different to merge both of them. r? `@jyn514`

…mut, r=dtolnay Make `UnsafeCell::get_mut` const

Tokenize emoji as if they were valid identifiers In the lexer, consider emojis to be valid identifiers and reject them later to avoid knock down parse errors. Partially address rust-lang#86102.

Fix duplicate bounds for const_trait_impl Fixes rust-lang#88383. Compare the constness of the candidates before winnowing and removing a `~const` `BoundCandidate`.

interpreter PointerArithmetic: use new Size helper methods

…und, r=camelid Fix jump def background Fixes rust-lang#88870. I somehow badly wrote the color in rust-lang#88111. r? `@camelid`

Reduce possibility of flaky tests As asked in rust-lang#88885. r? `@camelid`

GuillaumeGomez · 2021-09-13T18:59:46Z

@bors: r+ p=7 rollup=never

bors · 2021-09-13T18:59:47Z

📌 Commit 46b450f has been approved by GuillaumeGomez

rust-log-analyzer · 2021-09-13T19:16:17Z

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

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

   Compiling opaque-debug v0.3.0
   Compiling rustc_graphviz v0.0.0 (/checkout/compiler/rustc_graphviz)
   Compiling cpuid-bool v0.1.2
   Compiling unicode-width v0.1.8
   Compiling unic-common v0.9.0
   Compiling unic-char-range v0.9.0
   Compiling termcolor v1.1.2
   Compiling serde_derive v1.0.125
   Compiling serde v1.0.125
   Compiling annotate-snippets v0.8.0
---
   Compiling sharded-slab v0.1.1
   Compiling thread_local v1.0.1
   Compiling itertools v0.9.0
   Compiling getopts v0.2.21
   Compiling unic-ucd-version v0.9.0
   Compiling unic-char-property v0.9.0
   Compiling crossbeam-utils v0.7.2
   Compiling memoffset v0.5.5
   Compiling crossbeam-epoch v0.8.2
   Compiling num-traits v0.2.12
   Compiling num-traits v0.2.12
   Compiling num-integer v0.1.43
   Compiling generic-array v0.14.4
   Compiling unicode-normalization v0.1.13
   Compiling unic-emoji-char v0.9.0
   Compiling stacker v0.1.14
   Compiling rustc_llvm v0.0.0 (/checkout/compiler/rustc_llvm)
   Compiling rustc_apfloat v0.0.0 (/checkout/compiler/rustc_apfloat)
   Compiling ena v0.14.0
---
   Compiling stable_deref_trait v1.2.0
   Compiling rustc_graphviz v0.0.0 (/checkout/compiler/rustc_graphviz)
   Compiling cpuid-bool v0.1.2
   Compiling unicode-width v0.1.8
   Compiling unic-char-range v0.9.0
   Compiling unic-common v0.9.0
   Compiling serde_derive v1.0.125
   Compiling termcolor v1.1.2
   Compiling serde v1.0.125
   Compiling annotate-snippets v0.8.0
---
   Compiling tracing-core v0.1.17
   Compiling sharded-slab v0.1.1
   Compiling thread_local v1.0.1
   Compiling itertools v0.9.0
   Compiling unic-ucd-version v0.9.0
   Compiling getopts v0.2.21
   Compiling unic-char-property v0.9.0
   Compiling crossbeam-utils v0.7.2
   Compiling memoffset v0.5.5
   Compiling crossbeam-epoch v0.8.2
   Compiling num-traits v0.2.12
   Compiling num-traits v0.2.12
   Compiling num-integer v0.1.43
   Compiling generic-array v0.14.4
   Compiling unicode-normalization v0.1.13
   Compiling unic-emoji-char v0.9.0
   Compiling psm v0.1.16
   Compiling stacker v0.1.14
   Compiling rustc_llvm v0.0.0 (/checkout/compiler/rustc_llvm)
   Compiling ena v0.14.0
---
....................i.i............................................................................. 12100/12132
................................
failures:

---- [ui] ui/parser/emoji-identifiers.rs stdout ----


18 LL |     let _ = i_like_to_😄_a_lot() ➖ 4;
19    |             ^^^^^^^^^^^^^^^^^^ help: a function with a similar name exists: `i_like_to_😅_a_lot`
Some tests failed in compiletest suite=ui mode=ui host=x86_64-unknown-linux-gnu target=x86_64-unknown-linux-gnu
Some tests failed in compiletest suite=ui mode=ui host=x86_64-unknown-linux-gnu target=x86_64-unknown-linux-gnu
- error: identifiers cannot contain emoji: `i_like_to_😄_a_lot`
-   --> $DIR/emoji-identifiers.rs:13:13
-    |
- LL |     let _ = i_like_to_😄_a_lot() ➖ 4;
- 
- 
- error: identifiers cannot contain emoji: `full_of_✨`
-   --> $DIR/emoji-identifiers.rs:4:8
-    |
- LL |     fn full_of_✨() -> 👀 {
- 
- 
33 error: identifiers cannot contain emoji: `full_of✨`
34   --> $DIR/emoji-identifiers.rs:9:8

64    |
64    |
65 LL | struct ABig👩👩👧👧Family;
+ 
+ 
+ error: identifiers cannot contain emoji: `i_like_to_😄_a_lot`
+   --> $DIR/emoji-identifiers.rs:13:13
+    |
+ LL |     let _ = i_like_to_😄_a_lot() ➖ 4;
+ 
+ 
+ error: identifiers cannot contain emoji: `full_of_✨`
+   --> $DIR/emoji-identifiers.rs:4:8
+    |
+ LL |     fn full_of_✨() -> 👀 {
67 
67 
68 error[E0599]: no function or associated item named `full_of✨` found for struct `👀` in the current scope
69   --> $DIR/emoji-identifiers.rs:9:8

The actual stderr differed from the expected stderr.
The actual stderr differed from the expected stderr.
Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/parser/emoji-identifiers/emoji-identifiers.stderr
To update references, rerun the tests and pass the `--bless` flag
To only update this specific test, also pass `--test-args parser/emoji-identifiers.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/bin/rustc" "/checkout/src/test/ui/parser/emoji-identifiers.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Zemit-future-incompat-report" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/parser/emoji-identifiers" "-A" "unused" "-Crpath" "-O" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/parser/emoji-identifiers/auxiliary"
------------------------------------------

------------------------------------------
stderr:
stderr:
------------------------------------------
error: unknown start of token: \u{2796}
  --> /checkout/src/test/ui/parser/emoji-identifiers.rs:13:33
   |
LL |     let _ = i_like_to_😄_a_lot() ➖ 4; //~ ERROR cannot find function `i_like_to_😄_a_lot` in this scope
   |
   |
help: Unicode character '➖' (Heavy Minus Sign) looks like '-' (Minus/Hyphen), but it is not
   |
LL |     let _ = i_like_to_😄_a_lot() - 4; //~ ERROR cannot find function `i_like_to_😄_a_lot` in this scope


error[E0425]: cannot find function `i_like_to_😄_a_lot` in this scope
  --> /checkout/src/test/ui/parser/emoji-identifiers.rs:13:13
   |
LL | fn i_like_to_😅_a_lot() -> 👀 { //~ ERROR identifiers cannot contain emoji
   | ----------------------------- similarly named function `i_like_to_😅_a_lot` defined here
...
LL |     let _ = i_like_to_😄_a_lot() ➖ 4; //~ ERROR cannot find function `i_like_to_😄_a_lot` in this scope
   |             ^^^^^^^^^^^^^^^^^^ help: a function with a similar name exists: `i_like_to_😅_a_lot`

error: identifiers cannot contain emoji: `full_of✨`
  --> /checkout/src/test/ui/parser/emoji-identifiers.rs:9:8
   |
LL |     👀::full_of✨() //~ ERROR no function or associated item named `full_of✨` found for struct `👀`


error: identifiers cannot contain emoji: `👀`
  --> /checkout/src/test/ui/parser/emoji-identifiers.rs:2:8
   |
LL | struct 👀; //~ ERROR identifiers cannot contain emoji
LL | impl 👀 {
   |      ^^
   |      ^^
LL |     fn full_of_✨() -> 👀 { //~ ERROR identifiers cannot contain emoji
LL |         👀
   |         ^^
...
...
LL | fn i_like_to_😅_a_lot() -> 👀 { //~ ERROR identifiers cannot contain emoji
   |                            ^^
LL |     👀::full_of✨() //~ ERROR no function or associated item named `full_of✨` found for struct `👀`


error: identifiers cannot contain emoji: `i_like_to_😅_a_lot`
  --> /checkout/src/test/ui/parser/emoji-identifiers.rs:8:4
   |
LL | fn i_like_to_😅_a_lot() -> 👀 { //~ ERROR identifiers cannot contain emoji


error: identifiers cannot contain emoji: `ABig👩👩👧👧Family`
  --> /checkout/src/test/ui/parser/emoji-identifiers.rs:1:8
   |
LL | struct ABig👩👩👧👧Family; //~ ERROR identifiers cannot contain emoji


error: identifiers cannot contain emoji: `i_like_to_😄_a_lot`
  --> /checkout/src/test/ui/parser/emoji-identifiers.rs:13:13
   |
LL |     let _ = i_like_to_😄_a_lot() ➖ 4; //~ ERROR cannot find function `i_like_to_😄_a_lot` in this scope


error: identifiers cannot contain emoji: `full_of_✨`
  --> /checkout/src/test/ui/parser/emoji-identifiers.rs:4:8
   |
LL |     fn full_of_✨() -> 👀 { //~ ERROR identifiers cannot contain emoji


error[E0599]: no function or associated item named `full_of✨` found for struct `👀` in the current scope
  --> /checkout/src/test/ui/parser/emoji-identifiers.rs:9:8
   |
LL | struct 👀; //~ ERROR identifiers cannot contain emoji
   | ---------- function or associated item `full_of✨` not found for this
...
LL |     👀::full_of✨() //~ ERROR no function or associated item named `full_of✨` found for struct `👀`
   |         |
   |         function or associated item not found in `👀`
   |         function or associated item not found in `👀`
   |         help: there is an associated function with a similar name: `full_of_✨`
error: aborting due to 9 previous errors

Some errors have detailed explanations: E0425, E0599.
For more information about an error, try `rustc --explain E0425`.
For more information about an error, try `rustc --explain E0425`.

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



failures:
    [ui] ui/parser/emoji-identifiers.rs
test result: FAILED. 12029 passed; 1 failed; 102 ignored; 0 measured; 0 filtered out; finished in 130.54s




command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/ui" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--suite" "ui" "--mode" "ui" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/usr/lib/llvm-10/bin/FileCheck" "--nodejs" "/usr/bin/node" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python3" "--lldb-python" "/usr/bin/python3" "--gdb" "/usr/bin/gdb" "--quiet" "--llvm-version" "10.0.0" "--llvm-components" "aarch64 aarch64asmparser aarch64codegen aarch64desc aarch64disassembler aarch64info aarch64utils aggressiveinstcombine all all-targets amdgpu amdgpuasmparser amdgpucodegen amdgpudesc amdgpudisassembler amdgpuinfo amdgpuutils 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 engine executionengine frontendopenmp fuzzmutate globalisel hexagon hexagonasmparser hexagoncodegen hexagondesc hexagondisassembler hexagoninfo instcombine instrumentation interpreter ipo irreader jitlink lanai lanaiasmparser lanaicodegen lanaidesc lanaidisassembler lanaiinfo libdriver lineeditor linker lto 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 orcerror orcjit passes perfjitevents powerpc powerpcasmparser powerpccodegen powerpcdesc powerpcdisassembler powerpcinfo profiledata remarks riscv riscvasmparser riscvcodegen riscvdesc riscvdisassembler riscvinfo riscvutils 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 windowsmanifest x86 x86asmparser x86codegen x86desc x86disassembler x86info x86utils xcore xcorecodegen xcoredesc xcoredisassembler xcoreinfo xray" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--channel" "nightly" "--color" "always"


Build completed unsuccessfully in 0:13:30

GuillaumeGomez · 2021-09-13T19:20:05Z

@bors: r-

WaffleLapkin and others added 25 commits September 7, 2021 16:41

Make UnsafeCell::get_mut const

efeb461

Tokenize emoji as if they were valid indentifiers

9d64a8d

In the lexer, consider emojis to be valid identifiers and reject them later to avoid knock down parse errors.

Replace ZWJ with nothing in terminal output

01e2d29

Fix RustDoc

afb6f8d

Add unic-emoji-char and its dependencies to the allow list

19f1d0d

fix fmt

e0aedde

Account for confusable codepoints when recovering emoji identifiers

07cec2c

review comment: plural of emoji is emoji

aaa5c4e

replace_tabs -> normalize_whitespace

2b5cbb2

udpate comment to be more accurate

5979ed5

Fill in the tracking issue for #![feature(const_unsafecell_get_mut)]

2c30162

Fix duplicate bounds for const_trait_impl

a0b83f5

interpreter PointerArithmetic: use new Size helper methods

07b64bf

Fix invalid background for jump-to-def links in source code pages

6a2f500

Reduce possibility of flaky tests

cefa900

Add support for primitives in "jump to definition" feature

8f3fd3d

Add test for primitive in "jump to definition" feature

d73c0a3

* Enable generate-link-to-def feature on a rustdoc GUI test

9e482c1

* Add test for jump-to-def links background color

Rollup merge of rust-lang#88722 - WaffleLapkin:unsafe_cell_const_get_…

0d81ac0

…mut, r=dtolnay Make `UnsafeCell::get_mut` const

Rollup merge of rust-lang#88781 - estebank:emoji-idents, r=oli-obk

14861f1

Tokenize emoji as if they were valid identifiers In the lexer, consider emojis to be valid identifiers and reject them later to avoid knock down parse errors. Partially address rust-lang#86102.

Rollup merge of rust-lang#88851 - fee1-dead:dup-bound, r=oli-obk

56602a1

Fix duplicate bounds for const_trait_impl Fixes rust-lang#88383. Compare the constness of the candidates before winnowing and removing a `~const` `BoundCandidate`.

Rollup merge of rust-lang#88859 - RalfJung:size-helpers, r=oli-obk

6749289

interpreter PointerArithmetic: use new Size helper methods

Rollup merge of rust-lang#88885 - GuillaumeGomez:fix-jump-def-backgro…

b59be13

…und, r=camelid Fix jump def background Fixes rust-lang#88870. I somehow badly wrote the color in rust-lang#88111. r? `@camelid`

Rollup merge of rust-lang#88896 - GuillaumeGomez:flakyness, r=camelid

46b450f

Reduce possibility of flaky tests As asked in rust-lang#88885. r? `@camelid`

rustbot added the rollup A PR which is a rollup label Sep 13, 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 Sep 13, 2021

GuillaumeGomez mentioned this pull request Sep 13, 2021

Tokenize emoji as if they were valid identifiers #88781

Merged

GuillaumeGomez closed this Sep 13, 2021

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 Sep 13, 2021

GuillaumeGomez deleted the rollup-1zw8hcj branch September 13, 2021 19:20

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 7 pull requests#88913

Rollup of 7 pull requests#88913
GuillaumeGomez wants to merge 25 commits intorust-lang:masterfrom
GuillaumeGomez:rollup-1zw8hcj

GuillaumeGomez commented Sep 13, 2021

Uh oh!

GuillaumeGomez commented Sep 13, 2021

Uh oh!

bors commented Sep 13, 2021

Uh oh!

rust-log-analyzer commented Sep 13, 2021

Uh oh!

GuillaumeGomez commented Sep 13, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

Uh oh!

Conversation

GuillaumeGomez commented Sep 13, 2021

Uh oh!

GuillaumeGomez commented Sep 13, 2021

Uh oh!

bors commented Sep 13, 2021

Uh oh!

rust-log-analyzer commented Sep 13, 2021

Uh oh!

GuillaumeGomez commented Sep 13, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants