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

Rollup of 6 pull requests #108211

Merged
merged 17 commits into from
Feb 18, 2023
Merged

Rollup of 6 pull requests #108211

merged 17 commits into from
Feb 18, 2023

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

jieyouxu and others added 17 commits February 14, 2023 17:31
@jieyouxu
Don't recover lifetimes/labels containing emojis as character literals
380fa26 
Note that at the time of this commit, `unic-emoji-char` seems to have
data tables only up to Unicode 5.0, but Unicode is already newer than
this.

A newer emoji such as `🥺` will not be recognized as an emoji
but older emojis such as `🐱` will.
@jieyouxu
Update numeric lifetime test
98b82ae
@jieyouxu
Update lexer lifetime test
e3f9db5
@clubby789
Don't eagerly convert principal to string
eebd31c
@oli-obk
Don't allow evaluating queries that were fed in a previous compiler run
b4182d2
@weihanglo
Update cargo
55a7915 
10 commits in 39c13e67a5962466cc7253d41bc1099bbcb224c3..17b3d0de0897e1c6b8ca347bd39f850bb0a5b9f6
2023-02-12 02:01:08 +0000 to 2023-02-17 19:45:09 +0000

- fix: unsupported protocol error on old macos version (rust-lang/cargo#11733)
- Error on invalid alphanumeric token for crates.io (rust-lang/cargo#11600)
- Add clippy lints (rust-lang/cargo#11722)
- chore: Make dependencies alphabetical order (rust-lang/cargo#11719)
- chore: bump mdbook to 0.4.27 (rust-lang/cargo#11716)
- Amend `mdman` tests. (rust-lang/cargo#11715)
- Run CI for macOS on nightly (rust-lang/cargo#11712)
- doc: doc comments and intra-doc links for `core::compiler` (rust-lang/cargo#11711)
- Ensure em dashes are recognizable in markup (rust-lang/cargo#11646)
- Set CARGO_BIN_NAME environment variable also for binary examples (rust-lang/cargo#11705)
@compiler-errors
Adjust tracking issue for non_lifetime_binders
fded2e9
@compiler-errors
Move late-bound arg type checks to resolve_bound_vars
cec7835
@compiler-errors
Add addl test
5ec812d
@tshepang
link to llvm changes that prompted the special cases
225e01e
@tshepang
add a summary, in addition to the link
8ab795e
@matthiaskrgr
Rollup merge of rust-lang#108031 - jieyouxu:issue-108019, r=estebank
3035ccb 
Don't recover lifetimes/labels containing emojis as character literals

Fixes rust-lang#108019.

Note that at the time of this commit, `unic-emoji-char` seems to have data tables only up to Unicode 5.0, but Unicode is already newer than this.

A newer emoji such as `🥺` will not be recognized as an emoji but older emojis such as `🐱` will.

This PR leaves a couple of FIXMEs where `unic_emoji_char::is_emoji` is used.
@matthiaskrgr
Rollup merge of rust-lang#108046 - oli-obk:no_evaluating_fed_queries,…
d9c9040 
… r=cjgillot

Don't allow evaluating queries that were fed in a previous compiler run

r? `@cjgillot`

this code was already unreachable. Also we removed the no_hash + feeding restriction in rust-lang#105220.
@matthiaskrgr
Rollup merge of rust-lang#108162 - clubby789:issue-108155, r=Nilstrieb
7f9d9de 
Don't eagerly convert principal to string

Fixes rust-lang#108155

~~I haven't yet been able to reproduce the ICE in a minimal example unfortunately.~~ Added a test
@matthiaskrgr
Rollup merge of rust-lang#108186 - compiler-errors:closures-with-late…
d3d5163 
…-bound-types-r-bad, r=cjgillot

Deny non-lifetime bound vars in `for<..> ||` closure binders

Moves the check for illegal bound var types from astconv to resolve_bound_vars. If a binder is defined to have a type or const late-bound var that's not allowed, we'll resolve any usages to ty error or const error values, so we shouldn't ever see late-bound types or consts in places they aren't expected.

Fixes rust-lang#108184
Fixes rust-lang#108181
Fixes rust-lang#108192
@matthiaskrgr
Rollup merge of rust-lang#108197 - weihanglo:update-cargo, r=weihanglo
5d5e0b0 
Update cargo

10 commits in 39c13e67a5962466cc7253d41bc1099bbcb224c3..17b3d0de0897e1c6b8ca347bd39f850bb0a5b9f6 2023-02-12 02:01:08 +0000 to 2023-02-17 19:45:09 +0000

- fix: unsupported protocol error on old macos version (rust-lang/cargo#11733)
- Error on invalid alphanumeric token for crates.io (rust-lang/cargo#11600)
- Add clippy lints (rust-lang/cargo#11722)
- chore: Make dependencies alphabetical order (rust-lang/cargo#11719)
- chore: bump mdbook to 0.4.27 (rust-lang/cargo#11716)
- Amend `mdman` tests. (rust-lang/cargo#11715)
- Run CI for macOS on nightly (rust-lang/cargo#11712)
- doc: doc comments and intra-doc links for `core::compiler` (rust-lang/cargo#11711)
- Ensure em dashes are recognizable in markup (rust-lang/cargo#11646)
- Set CARGO_BIN_NAME environment variable also for binary examples (rust-lang/cargo#11705)

r? `@ghost`
@matthiaskrgr
Rollup merge of rust-lang#108205 - tshepang:why-special-case, r=cjgillot
6c91efd 
link to llvm changes that prompted the special cases
@rustbot rustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) 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. rollup A PR which is a rollup labels Feb 18, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=6

@bors
Copy link
Contributor

bors commented Feb 18, 2023

📌 Commit 6c91efd 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 Feb 18, 2023
@bors
Copy link
Contributor

bors commented Feb 18, 2023

⌛ Testing commit 6c91efd with merge 3eb5c45...

@bors
Copy link
Contributor

bors commented Feb 18, 2023

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 18, 2023
@bors bors merged commit 3eb5c45 into rust-lang:master Feb 18, 2023
@rustbot rustbot added this to the 1.69.0 milestone Feb 18, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha
#108205 6ae0aa9fb0c991392d7fb333b5ae0aac2d300a05
#108197 9cd9a70febedf8ae249e91b3c5dd252154c527b8
#108186 76450413c99daa2be3c1535c80b0c5279ceeae2c
#108162 331554692bdfe5f89aff524805d14d950e63b94e
#108046 3781b7ab9ea37ed7afe3b31133d7005dc2b325b0
#108031 35c3e0655130475ba185ee9660762b8a2b90ed27

previous master: 3701bdc633

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 Feb 18, 2023
Merged
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (3eb5c45): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

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

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)		 -0.1% [-0.1%, -0.1%] 1
Improvements ✅
(secondary)		 -5.3% [-5.3%, -5.3%] 1
All ❌✅ (primary) -0.1% [-0.1%, -0.1%] 1

Cycles

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

@matthiaskrgr matthiaskrgr deleted the rollup-e59onmm branch March 16, 2024 18:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) 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-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.69.0
Development

Successfully merging this pull request may close these issues.
10 participants
@matthiaskrgr @bors @rust-timer @rustbot @jieyouxu @clubby789 @oli-obk @weihanglo @compiler-errors @tshepang