Skip to content

Conversation

WaffleLapkin
Copy link
Member

@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 Jan 31, 2023
@oli-obk
Copy link
Contributor

oli-obk commented Jan 31, 2023

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jan 31, 2023

📌 Commit ef6b583 has been approved by oli-obk

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 Jan 31, 2023
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jan 31, 2023
Comment on lines +902 to 910
/// Is this edition 2015?
pub fn rust_2015(&self) -> bool {
self.edition() == Edition::Edition2015
self.edition().rust_2015()
}

/// Are we allowed to use features from the Rust 2018 edition?
pub fn rust_2018(&self) -> bool {
self.edition() >= Edition::Edition2018
self.edition().rust_2018()
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wait, so rust_2015 is edition == 2015, but rust_2018 is edition >= 2018? That's a bit confusing IMO

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we could rename rust_2015.. or rename all the subsequent ones to at_least_rust_2018? idk

GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jan 31, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 1, 2023
…llaumeGomez

Rollup of 12 pull requests

Successful merges:

 - rust-lang#106898 (Include both md and yaml ICE ticket templates)
 - rust-lang#107331 (Clean up eslint annotations and remove unused JS function)
 - rust-lang#107348 (small refactor to new projection code)
 - rust-lang#107354 (rustdoc: update Source Serif 4 from 4.004 to 4.005)
 - rust-lang#107412 (avoid needless checks)
 - rust-lang#107467 (Improve enum checks)
 - rust-lang#107486 (Track bound types like bound regions)
 - rust-lang#107491 (rustdoc: remove unused CSS from `.setting-check`)
 - rust-lang#107508 (`Edition` micro refactor)
 - rust-lang#107525 (PointeeInfo is advisory only)
 - rust-lang#107527 (rustdoc: stop making unstable items transparent)
 - rust-lang#107535 (Replace unwrap with ? in TcpListener doc)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit fe44f3b into rust-lang:master Feb 1, 2023
@rustbot rustbot added this to the 1.69.0 milestone Feb 1, 2023
@WaffleLapkin WaffleLapkin deleted the uneq'15 branch February 1, 2023 10:25
compiler-errors added a commit to compiler-errors/rust that referenced this pull request Feb 2, 2023
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Feb 2, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Feb 2, 2023
Rename `rust_2015` → `is_rust_2015`

r? ``@compiler-errors``
rust-lang#107508 (comment)
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Feb 2, 2023
Rename `rust_2015` → `is_rust_2015`

r? ```@compiler-errors```
rust-lang#107508 (comment)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

5 participants