Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

Rollup of 5 pull requests #116727

Merged
merged 11 commits into from
Oct 14, 2023
Merged

Rollup of 5 pull requests #116727

merged 11 commits into from
Oct 14, 2023

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

ouz-a and others added 11 commits October 11, 2023 17:55
@ouz-a
implement get_filename/lines for span
1d9481f
@onur-ozkan
remove outdated bootstrap FIXME
71bc63c 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@ouz-a
change fn name, return loc info, local name
d6a55d3
@fee1-dead
Fix a comment
eae6e02
@c410-f3r
Misc improvements
6b59f6f
@compiler-errors
Fix AFIT lint message to mention pitfall
362b75b
@matthiaskrgr
Rollup merge of rust-lang#116630 - ouz-a:smir_span_better, r=oli-obk
3890ba9 
Add ability to get lines/filename for Span in smir

Wasn't sure about how to structure lines, so went with safest option, also I'm not sure why `span_to_lines` returns `vec`.

Addresses rust-lang/project-stable-mir#44

r? ``@oli-obk``
@matthiaskrgr
Rollup merge of rust-lang#116644 - onur-ozkan:outdated-fixme, r=clubb…
b3da66d 
…y789

remove outdated bootstrap FIXME

emscripten-core/emscripten#9013 is fixed and this should be no longer needed.
@matthiaskrgr
Rollup merge of rust-lang#116695 - fee1-dead-contrib:fix-cmt, r=compi…
e515116 
…ler-errors

Fix a comment
@matthiaskrgr
Rollup merge of rust-lang#116696 - c410-f3r:in-doc, r=petrochenkov
6fef4f0 
Misc improvements

cc rust-lang#116323 (comment)

r? `@petrochenkov`
@matthiaskrgr
Rollup merge of rust-lang#116704 - compiler-errors:afit-lint-plus, r=…
24116ae 
…tmandry

Fix AFIT lint message to mention pitfall

Addresses rust-lang#116184 (comment) by adding a short note. Not sure exactly of the wording -- I don't think this should be a blocker for the stabilization PR since we can iterate on this lint's messaging in the next few weeks in the worst case.

r? `@tmandry` cc `@traviscross` `@jonhoo`
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Oct 14, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Oct 14, 2023

📌 Commit 24116ae has been approved by matthiaskrgr

It is now in the queue for this repository.

@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 Oct 14, 2023
@bors
Copy link
Contributor

bors commented Oct 14, 2023

⌛ Testing commit 24116ae with merge 715ff60...

bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 14, 2023
@bors
Auto merge of rust-lang#116727 - matthiaskrgr:rollup-3qqdrny, r=matth…
715ff60 
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#116630 (Add ability to get lines/filename for Span in smir)
 - rust-lang#116644 (remove outdated bootstrap FIXME)
 - rust-lang#116695 (Fix a comment)
 - rust-lang#116696 (Misc improvements)
 - rust-lang#116704 (Fix AFIT lint message to mention pitfall)

r? `@ghost`
`@rustbot` modify labels: rollup
@rust-log-analyzer
Copy link
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)

@bors
Copy link
Contributor

bors commented Oct 14, 2023

💔 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 14, 2023
@matthiaskrgr
Copy link
Member Author

@bors retry network timeout

@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 Oct 14, 2023
@bors
Copy link
Contributor

bors commented Oct 14, 2023

⌛ Testing commit 24116ae with merge 0233608...

@bors
Copy link
Contributor

bors commented Oct 14, 2023

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 0233608 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 14, 2023
@bors bors merged commit 0233608 into rust-lang:master Oct 14, 2023
@rustbot rustbot added this to the 1.75.0 milestone Oct 14, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#116630 Add ability to get lines/filename for Span in smir 2e86ba8843d0850353c5705feb7233de2d76d4af (link)
#116644 remove outdated bootstrap FIXME 572849a63be5688107153b6d116de3e3349a7b09 (link)
#116695 Fix a comment 91c4a0ede0a1c4a0ce74e93c5b5192ec07bc374f (link)
#116696 Misc improvements d7cdd9dddaf62770b87a7c8e31ce82156ad9ab63 (link)
#116704 Fix AFIT lint message to mention pitfall b36a690d3725a500d439d5ecc8793bd0a5ea70b5 (link)

previous master: 495c5ddcf7

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@bors bors mentioned this pull request Oct 14, 2023
Merged
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (0233608): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -2.0% [-3.2%, -0.8%] 2
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) -2.0% [-3.2%, -0.8%] 2

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 2.7% [2.7%, 2.7%] 1
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) - - 0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 627.574s -> 627.524s (-0.01%)
Artifact size: 271.31 MiB -> 271.31 MiB (-0.00%)

@Veykril Veykril mentioned this pull request Oct 17, 2023
Merged
bors-ferrocene bot added a commit to ferrocene/ferrocene that referenced this pull request Oct 17, 2023
@bors-ferrocene @a1phyr
@ColinFinck @ijackson @joshlf @fmease @tgross35 @EvanMerlock @joboet @RalfJung @DaniPopes @Mark-Simulacrum @onur-ozkan @nnethercote @the8472 @sthibaul @reez12g @Kobzol
Merge #54
4d5dcf2 
54: Pull upstream master 2023 10 17 r=pietroalbini a=Veykril

* rust-lang/rust#116196
* rust-lang/rust#116824
* rust-lang/rust#116822
* rust-lang/rust#116477
* rust-lang/rust#116826
* rust-lang/rust#116820
  * rust-lang/rust#116811
  * rust-lang/rust#116808
  * rust-lang/rust#116805
  * rust-lang/rust#116800
  * rust-lang/rust#116798
  * rust-lang/rust#116754
* rust-lang/rust#114370
* rust-lang/rust#116804
  * rust-lang/rust#116802
  * rust-lang/rust#116790
  * rust-lang/rust#116786
  * rust-lang/rust#116709
  * rust-lang/rust#116430
  * rust-lang/rust#116257
  * rust-lang/rust#114157
* rust-lang/rust#116731
* rust-lang/rust#116550
* rust-lang/rust#114330
* rust-lang/rust#116724
* rust-lang/rust#116782
  * rust-lang/rust#116776
  * rust-lang/rust#115955
  * rust-lang/rust#115196
* rust-lang/rust#116775
* rust-lang/rust#114589
* rust-lang/rust#113747
* rust-lang/rust#116772
  * rust-lang/rust#116771
  * rust-lang/rust#116760
  * rust-lang/rust#116755
  * rust-lang/rust#116732
  * rust-lang/rust#116522
  * rust-lang/rust#116341
  * rust-lang/rust#116172
* rust-lang/rust#110604
* rust-lang/rust#110729
* rust-lang/rust#116527
* rust-lang/rust#116688
* rust-lang/rust#116757
  * rust-lang/rust#116753
  * rust-lang/rust#116748
  * rust-lang/rust#116741
  * rust-lang/rust#116594
* rust-lang/rust#116691
* rust-lang/rust#116643
* rust-lang/rust#116683
* rust-lang/rust#116635
* rust-lang/rust#115515
* rust-lang/rust#116742
  * rust-lang/rust#116661
  * rust-lang/rust#116576
  * rust-lang/rust#116540
* rust-lang/rust#116352
* rust-lang/rust#116737
  * rust-lang/rust#116730
  * rust-lang/rust#116723
  * rust-lang/rust#116715
  * rust-lang/rust#116603
  * rust-lang/rust#116591
  * rust-lang/rust#115439
* rust-lang/rust#116264
* rust-lang/rust#116727
  * rust-lang/rust#116704
  * rust-lang/rust#116696
  * rust-lang/rust#116695
  * rust-lang/rust#116644
  * rust-lang/rust#116630
* rust-lang/rust#116728
  * rust-lang/rust#116689
  * rust-lang/rust#116679
  * rust-lang/rust#116618
  * rust-lang/rust#116577
  * rust-lang/rust#115653
* rust-lang/rust#116702
* rust-lang/rust#116015
* rust-lang/rust#115822
* rust-lang/rust#116407
* rust-lang/rust#115719
* rust-lang/rust#115524
* rust-lang/rust#116705
* rust-lang/rust#116645
* rust-lang/rust#116233
* rust-lang/rust#115108
* rust-lang/rust#116670
* rust-lang/rust#116676
* rust-lang/rust#116666



Co-authored-by: Benoît du Garreau <bdgdlm@outlook.com>
Co-authored-by: Colin Finck <colin@reactos.org>
Co-authored-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Co-authored-by: Joshua Liebow-Feeser <joshlf@users.noreply.github.com>
Co-authored-by: León Orell Valerian Liehr <me@fmease.dev>
Co-authored-by: Trevor Gross <tmgross@umich.edu>
Co-authored-by: Evan Merlock <evan@merlock.dev>
Co-authored-by: joboet <jonasboettiger@icloud.com>
Co-authored-by: Ralf Jung <post@ralfj.de>
Co-authored-by: DaniPopes <57450786+DaniPopes@users.noreply.github.com>
Co-authored-by: Mark Rousskov <mark.simulacrum@gmail.com>
Co-authored-by: onur-ozkan <work@onurozkan.dev>
Co-authored-by: Nicholas Nethercote <n.nethercote@gmail.com>
Co-authored-by: The 8472 <git@infinite-source.de>
Co-authored-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Co-authored-by: reez12g <reez12g@gmail.com>
Co-authored-by: Jakub Beránek <berykubik@gmail.com>
@matthiaskrgr matthiaskrgr deleted the rollup-3qqdrny branch March 16, 2024 18:18
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.75.0
Development

Successfully merging this pull request may close these issues.
10 participants
@matthiaskrgr @bors @rust-log-analyzer @rust-timer @rustbot @ouz-a @onur-ozkan @fee1-dead @c410-f3r @compiler-errors