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

add lazy_normalization_consts feature gate #74000

Merged
merged 1 commit into from
Jul 6, 2020
Merged

add lazy_normalization_consts feature gate #74000

merged 1 commit into from
Jul 6, 2020

Conversation

lcnr
Copy link
Contributor

@lcnr lcnr commented Jul 3, 2020

In #71973 I underestimated the amount of code which is influenced by lazy normalization of consts
and decided against having a separate feature flag for this.

Looking a bit more into this, the following issues are already working with lazy norm in its current state #47814 #57739 #73980

I therefore think it is worth it to enable lazy norm separately. Note that #![feature(const_generics)] still automatically activates
this feature, so using #![feature(const_generics, lazy_normalization_consts)] is redundant.

r? @varkor @nikomatsakis

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 3, 2020
@lcnr lcnr force-pushed the lazy_normalisation_consts branch 2 times, most recently from e8072b6 to dfbdac0 Compare July 3, 2020 16:37
@varkor
Copy link
Member

varkor commented Jul 3, 2020

r=me with comment fixed.

@lcnr
Copy link
Contributor Author

lcnr commented Jul 3, 2020

@bors r=varkor

@bors
Copy link
Contributor

bors commented Jul 3, 2020

📌 Commit a9f129f18f4d4a998a38d5d9d06165991ef45848 has been approved by varkor

@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 Jul 3, 2020
@Manishearth Manishearth mentioned this pull request Jul 4, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 4, 2020
@bors
Auto merge of rust-lang#74019 - Manishearth:rollup-2st3jsk, r=Manishe…
dbf3ae7 
…arth

Rollup of 12 pull requests

Successful merges:

 - rust-lang#73140 (Fallback to xml.etree.ElementTree)
 - rust-lang#73670 (Add `format_args_capture` feature)
 - rust-lang#73693 (Use exhaustive match in const_prop.rs)
 - rust-lang#73845 (Use &raw in A|Rc::as_ptr)
 - rust-lang#73861 (Create E0768)
 - rust-lang#73881 (Standardize bibliographic citations in rustc API docs)
 - rust-lang#73925 (Improve comments from rust-lang#72617, as suggested by RalfJung)
 - rust-lang#73949 ([mir-opt] Fix mis-optimization and other issues with the SimplifyArmIdentity pass)
 - rust-lang#73984 (Edit docs for rustc_data_structures::graph::scc)
 - rust-lang#73985 (Fix "getting started" link)
 - rust-lang#73997 (fix typo)
 - rust-lang#73999 (Bump mingw-check CI image from Ubuntu 16.04 to 18.04.)

Failed merges:

 - rust-lang#74000 (add `lazy_normalization_consts` feature gate)

r? @ghost
@bors
Copy link
Contributor

bors commented Jul 4, 2020

☔ The latest upstream changes (presumably #74019) made this pull request unmergeable. Please resolve the merge conflicts.

@bors 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 Jul 4, 2020
@lcnr lcnr force-pushed the lazy_normalisation_consts branch from a9f129f to db029b7 Compare July 4, 2020 08:14
@lcnr
Copy link
Contributor Author

lcnr commented Jul 4, 2020

@bors r=varkor

@bors
Copy link
Contributor

bors commented Jul 4, 2020

📌 Commit db029b7f7c2c67340a89593bcd99d6e00ff715d2 has been approved by varkor

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 4, 2020
@lcnr
Copy link
Contributor Author

lcnr commented Jul 4, 2020

@bors r-

@bors 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 Jul 4, 2020
@lcnr lcnr force-pushed the lazy_normalisation_consts branch from db029b7 to 7a3081b Compare July 4, 2020 08:50
@lcnr
Copy link
Contributor Author

lcnr commented Jul 4, 2020

@bors r=varkor

I forgot to incorporate the comment fix in my rebase 😅

@bors
Copy link
Contributor

bors commented Jul 4, 2020

📌 Commit 7a3081b has been approved by varkor

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 4, 2020
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 4, 2020
@Manishearth
Rollup merge of rust-lang#74000 - lcnr:lazy_normalisation_consts, r=v…
a2f06be 
…arkor

add `lazy_normalization_consts` feature gate

In rust-lang#71973 I underestimated the amount of code which is influenced by lazy normalization of consts
and decided against having a separate feature flag for this.

Looking a bit more into this, the following issues are already working with lazy norm in its current state rust-lang#47814 rust-lang#57739 rust-lang#73980

I therefore think it is worth it to enable lazy norm separately. Note that `#![feature(const_generics)]` still automatically activates
this feature, so using `#![feature(const_generics, lazy_normalization_consts)]` is redundant.

r? @varkor @nikomatsakis
@Manishearth Manishearth mentioned this pull request Jul 4, 2020
Closed
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 5, 2020
@Manishearth
Rollup merge of rust-lang#74000 - lcnr:lazy_normalisation_consts, r=v…
0d23e5e 
…arkor

add `lazy_normalization_consts` feature gate

In rust-lang#71973 I underestimated the amount of code which is influenced by lazy normalization of consts
and decided against having a separate feature flag for this.

Looking a bit more into this, the following issues are already working with lazy norm in its current state rust-lang#47814 rust-lang#57739 rust-lang#73980

I therefore think it is worth it to enable lazy norm separately. Note that `#![feature(const_generics)]` still automatically activates
this feature, so using `#![feature(const_generics, lazy_normalization_consts)]` is redundant.

r? @varkor @nikomatsakis
@Manishearth Manishearth mentioned this pull request Jul 5, 2020
Closed
@bors
Copy link
Contributor

bors commented Jul 5, 2020

⌛ Testing commit 7a3081b with merge 7f2bbc4a350481f2e990f1caa7a978af545e14e7...

@bors
Copy link
Contributor

bors commented Jul 5, 2020

💥 Test timed out

@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 Jul 5, 2020
@Dylan-DPC-zz
Copy link

@bors retry

@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 Jul 5, 2020
@Manishearth Manishearth mentioned this pull request Jul 5, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 5, 2020
@bors
Auto merge of rust-lang#74073 - Manishearth:rollup-faqo9lx, r=Manishe…
0c03aee 
…arth

Rollup of 12 pull requests

Successful merges:

 - rust-lang#72688 (added .collect() into String from Box<str>)
 - rust-lang#73787 (Add unstable docs for rustc_attrs)
 - rust-lang#73834 (Some refactoring around intrinsic type checking)
 - rust-lang#73871 (Fix try_print_visible_def_path for Rust 2018)
 - rust-lang#73937 (Explain exhaustive matching on {usize,isize} maximum values)
 - rust-lang#73973 (Use `Span`s to identify unreachable subpatterns in or-patterns)
 - rust-lang#74000 (add `lazy_normalization_consts` feature gate)
 - rust-lang#74025 (Remove unnecessary release from Arc::try_unwrap)
 - rust-lang#74027 (Convert more `DefId`s to `LocalDefId`s)
 - rust-lang#74055 (Fix spacing in Iterator fold doc)
 - rust-lang#74057 (expected_found `&T` -> `T`)
 - rust-lang#74064 (variant_count: avoid incorrect dummy implementation)

Failed merges:

r? @ghost
@bors bors merged commit 0eadeda into rust-lang:master Jul 6, 2020
@lcnr lcnr deleted the lazy_normalisation_consts branch July 6, 2020 06:51
@cuviper cuviper added this to the 1.46 milestone May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@varkor varkor varkor left review comments

Assignees

@varkor varkor

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.46
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@lcnr @varkor @bors @Dylan-DPC-zz @cuviper @rust-highfive