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.

Sign up for GitHub

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

Jump to bottom

Fix some typos #117911

Merged
merged 1 commit into from
Nov 15, 2023
Merged

Fix some typos #117911

merged 1 commit into from
Nov 15, 2023

Conversation

cuishuang
Copy link
Contributor

No description provided.

@cuishuang
Fix some typos
a44a4ed 
Signed-off-by: cui fliter <[email protected]>
@rustbot
Copy link
Collaborator

rustbot commented Nov 14, 2023

r? @davidtwco

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Nov 14, 2023
@lqd
Copy link
Member

lqd commented Nov 14, 2023

Thank you!

r? lqd @bors r+ rollup

@bors
Copy link
Contributor

bors commented Nov 14, 2023

📌 Commit a44a4ed has been approved by lqd

It is now in the queue for this repository.

@rustbot rustbot assigned lqd and unassigned davidtwco Nov 14, 2023
@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-review Status: Awaiting review from the assignee but also interested parties. labels Nov 14, 2023
@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot) 
GITHUB_ACTION=__run_7
GITHUB_ACTIONS=true
GITHUB_ACTION_REF=
GITHUB_ACTION_REPOSITORY=
GITHUB_ACTOR=cuishuang
GITHUB_API_URL=https://api.github.com
GITHUB_BASE_REF=master
GITHUB_ENV=/home/runner/work/_temp/_runner_file_commands/set_env_fd21cd26-25db-43b3-a829-5a27c5cb6899
GITHUB_EVENT_NAME=pull_request
---
GITHUB_SERVER_URL=https://github.com
GITHUB_SHA=60ffcaa5bf52a8bc2a2c2427c8e97a193a953651
GITHUB_STATE=/home/runner/work/_temp/_runner_file_commands/save_state_fd21cd26-25db-43b3-a829-5a27c5cb6899
GITHUB_STEP_SUMMARY=/home/runner/work/_temp/_runner_file_commands/step_summary_fd21cd26-25db-43b3-a829-5a27c5cb6899
GITHUB_TRIGGERING_ACTOR=cuishuang
GITHUB_WORKFLOW_REF=rust-lang/rust/.github/workflows/ci.yml@refs/pull/117911/merge
GITHUB_WORKFLOW_SHA=60ffcaa5bf52a8bc2a2c2427c8e97a193a953651
GITHUB_WORKSPACE=/home/runner/work/rust/rust
GOROOT_1_19_X64=/opt/hostedtoolcache/go/1.19.13/x64
---
.......i.i...........i......................ii..............i.i..i........iiiiiiiiiii... 176/540
..i..i.................iiiii.ii.i.i.....i..iiiii.......i.i.i....i.i......iiiii........ii 264/540
........i.ii.....i..i..i........................i...ii..ii.i....iiiiiiii...i.ii......... 352/540
.......ii......................i.........i........................ii.i.ii.iiiiii.i...... 440/540
...........i....i....i..ii...........ii.....i...F...............ii....iiiiii.iiiiii..... 528/540

failures:

---- [codegen] tests/codegen/target-feature-inline-closure.rs stdout ----
---- [codegen] tests/codegen/target-feature-inline-closure.rs stdout ----

error: verification with 'FileCheck' failed
status: exit status: 1
command: "/usr/lib/llvm-15/bin/FileCheck" "--input-file" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/codegen/target-feature-inline-closure/target-feature-inline-closure.ll" "/checkout/tests/codegen/target-feature-inline-closure.rs" "--allow-unused-prefixes" "--check-prefixes" "CHECK,NONMSVC" "--dump-input-context" "100"
--- stderr -------------------------------
/checkout/tests/codegen/target-feature-inline-closure.rs:27:16: error: CHECK-NOT: excluded string found in input
/checkout/tests/codegen/target-feature-inline-closure.rs:27:16: error: CHECK-NOT: excluded string found in input
 // CHECK-NOT: fadd
               ^
/checkout/obj/build/x86_64-unknown-linux-gnu/test/codegen/target-feature-inline-closure/target-feature-inline-closure.ll:35:65: note: found here
 call fastcc void @_ZN4core9core_arch3x863avx13_mm256_add_ps17h3fadd029fdf681ecE(ptr noalias nocapture noundef nonnull align 32 dereferenceable(32) %_0, ptr noalias nocapture noundef nonnull align 32 dereferenceable(32) %1, ptr noalias nocapture noundef nonnull align 32 dereferenceable(32) %0)

Input file: /checkout/obj/build/x86_64-unknown-linux-gnu/test/codegen/target-feature-inline-closure/target-feature-inline-closure.ll
Check file: /checkout/tests/codegen/target-feature-inline-closure.rs


-dump-input=help explains the following input dump.

Input was:
<<<<<<
<<<<<<
        1: ; ModuleID = 'target_feature_inline_closure.5b935a73a363356c-cgu.0' 
        2: source_filename = "target_feature_inline_closure.5b935a73a363356c-cgu.0" 
        3: target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" 
        4: target triple = "x86_64-unknown-linux-gnu" 
        5:  
        6: ; core::core_arch::x86::avx::_mm256_add_ps 
        7: ; Function Attrs: argmemonly inlinehint mustprogress nofree norecurse nosync nounwind nonlazybind willreturn uwtable 
        8: define internal fastcc void @_ZN4core9core_arch3x863avx13_mm256_add_ps17h3fadd029fdf681ecE(ptr noalias nocapture noundef writeonly align 32 dereferenceable(32) %_0, ptr noalias nocapture noundef readonly align 32 dereferenceable(32) %a, ptr noalias nocapture noundef readonly align 32 dereferenceable(32) %b) unnamed_addr #0 { 
        9: start: 
       10:  %0 = load <8 x float>, ptr %a, align 32 
       11:  %1 = load <8 x float>, ptr %b, align 32 
       12:  %2 = fadd <8 x float> %0, %1 
       13:  store <8 x float> %2, ptr %_0, align 32 
       14:  ret void 
       15: } 
       16:  
       17: ; Function Attrs: mustprogress nofree nosync nounwind nonlazybind willreturn uwtable 
       18: define void @with_avx(ptr noalias nocapture noundef writeonly sret(<8 x float>) align 32 dereferenceable(32) %_0, ptr noalias nocapture noundef readonly align 32 dereferenceable(32) %x) unnamed_addr #1 { 
       19: start: 
       20:  %0 = load <8 x float>, ptr %x, align 32 
       21:  %1 = fadd <8 x float> %0, %0 
       22:  store <8 x float> %1, ptr %_0, align 32, !alias.scope !3, !noalias !6 
       23:  ret void 
       24: } 
       25:  
       26: ; Function Attrs: argmemonly mustprogress nofree norecurse nosync nounwind nonlazybind willreturn uwtable 
       27: define void @without_avx(ptr noalias nocapture noundef writeonly sret(<8 x float>) align 32 dereferenceable(32) %_0, ptr noalias nocapture noundef readonly align 32 dereferenceable(32) %x) unnamed_addr #2 { 
       28: start: 
       29:  %0 = alloca <8 x float>, align 32 
       30:  %1 = alloca <8 x float>, align 32 
       31:  %2 = load <8 x float>, ptr %x, align 32 
       32:  store <8 x float> %2, ptr %1, align 32 
       33:  store <8 x float> %2, ptr %0, align 32 
       34: ; call core::core_arch::x86::avx::_mm256_add_ps 
       35:  call fastcc void @_ZN4core9core_arch3x863avx13_mm256_add_ps17h3fadd029fdf681ecE(ptr noalias nocapture noundef nonnull align 32 dereferenceable(32) %_0, ptr noalias nocapture noundef nonnull align 32 dereferenceable(32) %1, ptr noalias nocapture noundef nonnull align 32 dereferenceable(32) %0) 
not:27                                                                     !~~~                                                                                                                                                                                                                                    error: no match expected
       36:  ret void 
       37: } 
       38:  
       39: attributes #0 = { argmemonly inlinehint mustprogress nofree norecurse nosync nounwind nonlazybind willreturn uwtable "probe-stack"="__rust_probestack" "target-cpu"="x86-64" "target-features"="+avx" } 
       40: attributes #1 = { mustprogress nofree nosync nounwind nonlazybind willreturn uwtable "probe-stack"="__rust_probestack" "target-cpu"="x86-64" "target-features"="+avx" } 
       41: attributes #2 = { argmemonly mustprogress nofree norecurse nosync nounwind nonlazybind willreturn uwtable "probe-stack"="__rust_probestack" "target-cpu"="x86-64" } 
       42:  
       43: !llvm.module.flags = !{!0, !1} 
       44: !llvm.ident = !{!2} 
       45:  
       46: !0 = !{i32 7, !"PIC Level", i32 2} 
       47: !1 = !{i32 2, !"RtLibUseGOT", i32 1} 
       48: !2 = !{!"rustc version 1.76.0-nightly (60ffcaa5b 2023-11-14)"} 
       49: !3 = !{!4} 
       50: !4 = distinct !{!4, !5, !"_ZN4core9core_arch3x863avx13_mm256_add_ps17h3fadd029fdf681ecE: %_0"} 
       51: !5 = distinct !{!5, !"_ZN4core9core_arch3x863avx13_mm256_add_ps17h3fadd029fdf681ecE"} 
       52: !6 = !{!7, !8, !9, !11} 
       53: !7 = distinct !{!7, !5, !"_ZN4core9core_arch3x863avx13_mm256_add_ps17h3fadd029fdf681ecE: %a"} 
       54: !8 = distinct !{!8, !5, !"_ZN4core9core_arch3x863avx13_mm256_add_ps17h3fadd029fdf681ecE: %b"} 
       55: !9 = distinct !{!9, !10, !"_ZN29target_feature_inline_closure8with_avx28_$u7b$$u7b$closure$u7d$$u7d$17h290a70f483fca7b7E: %x"} 
       56: !10 = distinct !{!10, !"_ZN29target_feature_inline_closure8with_avx28_$u7b$$u7b$closure$u7d$$u7d$17h290a70f483fca7b7E"} 
       57: !11 = distinct !{!11, !10, !"_ZN29target_feature_inline_closure8with_avx28_$u7b$$u7b$closure$u7d$$u7d$17h290a70f483fca7b7E: %y"} 
------------------------------------------

@lqd
Copy link
Member

lqd commented Nov 14, 2023

The test failure is unrelated to this PR: #117060.

@lqd
Copy link
Member

lqd commented Nov 14, 2023

Let's see if closing + reopening will trigger the PR builder with the new master commit, and hopefully not have this flaky test fail.

@lqd lqd closed this Nov 14, 2023
@lqd lqd reopened this Nov 14, 2023
@Noratrieb
Copy link
Member

Noratrieb commented Nov 14, 2023 •
edited
Loading

not that it matters, bors doesn't consider the greenness of the PR when deciding to merge. the commit is still approved: https://bors.rust-lang.org/queue/rust

@lqd
Copy link
Member

lqd commented Nov 14, 2023 •
edited
Loading

Even if it's not marked mergeable? (or rather, neither yes nor no). Maybe that would impact the automated PR rollup builder. No big deal anyways.

@Noratrieb
Copy link
Member

i think it doesnt care, but im not sure

@lqd
Copy link
Member

lqd commented Nov 14, 2023 •
edited
Loading

I guess we'll find out soon enough since CI failed again

@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot) 
....i.i..............i......................ii..............i.i.i.........iiiiiiiiiii... 176/540
..i..i..................iiiii.iii..i....i..iiiii.......i.i.i....i.i......iiiii........ii 264/540
........i.ii.....i..i..i........................i...ii..ii.i....iiiiiiii...i.ii......... 352/540
.......ii......................i.........i........................ii.i.ii.iiiiii.i...... 440/540
...........i....i....i..ii..........ii......i...F...............ii...iiii.ii.iiiiii..... 528/540

failures:

---- [codegen] tests/codegen/target-feature-inline-closure.rs stdout ----
---- [codegen] tests/codegen/target-feature-inline-closure.rs stdout ----

error: verification with 'FileCheck' failed
status: exit status: 1
command: "/usr/lib/llvm-15/bin/FileCheck" "--input-file" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/codegen/target-feature-inline-closure/target-feature-inline-closure.ll" "/checkout/tests/codegen/target-feature-inline-closure.rs" "--allow-unused-prefixes" "--check-prefixes" "CHECK,NONMSVC" "--dump-input-context" "100"
Build completed unsuccessfully in 0:13:08
--- stderr -------------------------------
/checkout/tests/codegen/target-feature-inline-closure.rs:27:16: error: CHECK-NOT: excluded string found in input
/checkout/tests/codegen/target-feature-inline-closure.rs:27:16: error: CHECK-NOT: excluded string found in input
 // CHECK-NOT: fadd
               ^
/checkout/obj/build/x86_64-unknown-linux-gnu/test/codegen/target-feature-inline-closure/target-feature-inline-closure.ll:35:65: note: found here
 call fastcc void @_ZN4core9core_arch3x863avx13_mm256_add_ps17h3fadd029fdf681ecE(ptr noalias nocapture noundef nonnull align 32 dereferenceable(32) %_0, ptr noalias nocapture noundef nonnull align 32 dereferenceable(32) %1, ptr noalias nocapture noundef nonnull align 32 dereferenceable(32) %0)

Input file: /checkout/obj/build/x86_64-unknown-linux-gnu/test/codegen/target-feature-inline-closure/target-feature-inline-closure.ll
Check file: /checkout/tests/codegen/target-feature-inline-closure.rs


-dump-input=help explains the following input dump.
Input was:
<<<<<<
<<<<<<
        1: ; ModuleID = 'target_feature_inline_closure.5b935a73a363356c-cgu.0' 
        2: source_filename = "target_feature_inline_closure.5b935a73a363356c-cgu.0" 
        3: target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" 
        4: target triple = "x86_64-unknown-linux-gnu" 
        5:  
        6: ; core::core_arch::x86::avx::_mm256_add_ps 
        7: ; Function Attrs: argmemonly inlinehint mustprogress nofree norecurse nosync nounwind nonlazybind willreturn uwtable 
        8: define internal fastcc void @_ZN4core9core_arch3x863avx13_mm256_add_ps17h3fadd029fdf681ecE(ptr noalias nocapture noundef writeonly align 32 dereferenceable(32) %_0, ptr noalias nocapture noundef readonly align 32 dereferenceable(32) %a, ptr noalias nocapture noundef readonly align 32 dereferenceable(32) %b) unnamed_addr #0 { 
        9: start: 
       10:  %0 = load <8 x float>, ptr %a, align 32 
       11:  %1 = load <8 x float>, ptr %b, align 32 
       12:  %2 = fadd <8 x float> %0, %1 
       13:  store <8 x float> %2, ptr %_0, align 32 
       14:  ret void 
       15: } 
       16:  
       17: ; Function Attrs: mustprogress nofree nosync nounwind nonlazybind willreturn uwtable 
       18: define void @with_avx(ptr noalias nocapture noundef writeonly sret(<8 x float>) align 32 dereferenceable(32) %_0, ptr noalias nocapture noundef readonly align 32 dereferenceable(32) %x) unnamed_addr #1 { 
       19: start: 
       20:  %0 = load <8 x float>, ptr %x, align 32 
       21:  %1 = fadd <8 x float> %0, %0 
       22:  store <8 x float> %1, ptr %_0, align 32, !alias.scope !3, !noalias !6 
       23:  ret void 
       24: } 
       25:  
       26: ; Function Attrs: argmemonly mustprogress nofree norecurse nosync nounwind nonlazybind willreturn uwtable 
       27: define void @without_avx(ptr noalias nocapture noundef writeonly sret(<8 x float>) align 32 dereferenceable(32) %_0, ptr noalias nocapture noundef readonly align 32 dereferenceable(32) %x) unnamed_addr #2 { 
       28: start: 
       29:  %0 = alloca <8 x float>, align 32 
       30:  %1 = alloca <8 x float>, align 32 
       31:  %2 = load <8 x float>, ptr %x, align 32 
       32:  store <8 x float> %2, ptr %1, align 32 
       33:  store <8 x float> %2, ptr %0, align 32 
       34: ; call core::core_arch::x86::avx::_mm256_add_ps 
       35:  call fastcc void @_ZN4core9core_arch3x863avx13_mm256_add_ps17h3fadd029fdf681ecE(ptr noalias nocapture noundef nonnull align 32 dereferenceable(32) %_0, ptr noalias nocapture noundef nonnull align 32 dereferenceable(32) %1, ptr noalias nocapture noundef nonnull align 32 dereferenceable(32) %0) 
not:27                                                                     !~~~                                                                                                                                                                                                                                    error: no match expected
       36:  ret void 
       37: } 
       38:  
       39: attributes #0 = { argmemonly inlinehint mustprogress nofree norecurse nosync nounwind nonlazybind willreturn uwtable "probe-stack"="__rust_probestack" "target-cpu"="x86-64" "target-features"="+avx" } 
       40: attributes #1 = { mustprogress nofree nosync nounwind nonlazybind willreturn uwtable "probe-stack"="__rust_probestack" "target-cpu"="x86-64" "target-features"="+avx" } 
       41: attributes #2 = { argmemonly mustprogress nofree norecurse nosync nounwind nonlazybind willreturn uwtable "probe-stack"="__rust_probestack" "target-cpu"="x86-64" } 
       42:  
       43: !llvm.module.flags = !{!0, !1} 
       44: !llvm.ident = !{!2} 
       45:  
       46: !0 = !{i32 7, !"PIC Level", i32 2} 
       47: !1 = !{i32 2, !"RtLibUseGOT", i32 1} 
       48: !2 = !{!"rustc version 1.76.0-nightly (60ffcaa5b 2023-11-14)"} 
       49: !3 = !{!4} 
       50: !4 = distinct !{!4, !5, !"_ZN4core9core_arch3x863avx13_mm256_add_ps17h3fadd029fdf681ecE: %_0"} 
       51: !5 = distinct !{!5, !"_ZN4core9core_arch3x863avx13_mm256_add_ps17h3fadd029fdf681ecE"} 
       52: !6 = !{!7, !8, !9, !11} 
       53: !7 = distinct !{!7, !5, !"_ZN4core9core_arch3x863avx13_mm256_add_ps17h3fadd029fdf681ecE: %a"} 
       54: !8 = distinct !{!8, !5, !"_ZN4core9core_arch3x863avx13_mm256_add_ps17h3fadd029fdf681ecE: %b"} 
       55: !9 = distinct !{!9, !10, !"_ZN29target_feature_inline_closure8with_avx28_$u7b$$u7b$closure$u7d$$u7d$17h290a70f483fca7b7E: %x"} 
       56: !10 = distinct !{!10, !"_ZN29target_feature_inline_closure8with_avx28_$u7b$$u7b$closure$u7d$$u7d$17h290a70f483fca7b7E"} 
       57: !11 = distinct !{!11, !10, !"_ZN29target_feature_inline_closure8with_avx28_$u7b$$u7b$closure$u7d$$u7d$17h290a70f483fca7b7E: %y"} 
------------------------------------------

@matthiaskrgr matthiaskrgr mentioned this pull request Nov 14, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 14, 2023
@bors
Auto merge of rust-lang#117915 - matthiaskrgr:rollup-ztljqrr, r=matth…
003fa88 
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#116244 (Apply structured suggestion that allows test to work since 1.64)
 - rust-lang#117686 (Build pre-coroutine-transform coroutine body on error)
 - rust-lang#117834 (target_feature: make it more clear what that 'Option' means)
 - rust-lang#117893 (Suggest dereferencing the LHS for binops such as `&T == T`)
 - rust-lang#117911 (Fix some typos)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 2e00c6f into rust-lang:master Nov 15, 2023
16 of 22 checks passed
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Nov 15, 2023
@rust-timer
Unrolled build for rust-lang#117911
c367d2c 
Rollup merge of rust-lang#117911 - catandcoder:master, r=lqd

Fix some typos
@rustbot rustbot added this to the 1.76.0 milestone Nov 15, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@lqd lqd

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.76.0
Development

Successfully merging this pull request may close these issues.
7 participants
@cuishuang @rustbot @lqd @bors @rust-log-analyzer @Noratrieb @davidtwco