Fix generic argument lookup for Self #59025

aoikonomopoulos · 2019-03-08T19:10:10Z

Rewrite the SelfCtor early and use the replacement Def when
calculating the path_segs.

Note that this also changes which def is seen by the code that
computes user_self_ty and is_alias_variant_ctor; I don't see a
immediate issue with that, but I'm not 100% clear on the
implications.

Fixes #57924

r? @eddyb

petrochenkov · 2019-03-12T06:19:47Z

r? @varkor

varkor

This looks good to me.

However, as commit 2157958 that introduced the SelfCtor rewriting explicitly placed it right before the call to create_substs_for_generic_args, I'm unsure as to whether this is the most appropriate fix (or indeed a correct fix).

I don't think the SelfCtor replacement was placed there specifically. I don't see a reason not to do the replacement immediately like you do here.

r=me when the match/if let comment has been addressed.

varkor · 2019-03-12T18:30:07Z

src/librustc_typeck/check/mod.rs

+    // Rewrite `SelfCtor` to `StructCtor`
+    pub fn rewrite_self(&self, def : Def, span : Span) -> (Def, DefId, Ty<'tcx>) {
+        let tcx = self.tcx;
+        match def {


I know this was present in the original code too, but could you change this match to if let (we really just care whether we have Def::SelfCtor or not).

Sure. Will also rename rewrite_self to the more accurate rewrite_self_ctor.

eddyb · 2019-03-13T12:44:11Z

src/librustc_typeck/check/mod.rs

@@ -5302,6 +5302,53 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
        Some(original_span.with_lo(original_span.hi() - BytePos(1)))
    }

+    // Rewrite `SelfCtor` to `StructCtor`
+    pub fn rewrite_self_ctor(&self, def : Def, span : Span) -> (Def, DefId, Ty<'tcx>) {


Nit picking: the Rust style is def: Def, span: Span.

Rewrite the SelfCtor early and use the replacement Def when calculating the path_segs. Note that this also changes which def is seen by the code that computes user_self_ty and is_alias_variant_ctor; I don't see a immediate issue with that, but I'm not 100% clear on the implications. Fixes rust-lang#57924

varkor · 2019-03-13T13:37:15Z

Thanks!

@bors r+ rollup

bors · 2019-03-13T13:37:18Z

📌 Commit 311025e has been approved by varkor

@eddyb

Fix generic argument lookup for Self Rewrite the SelfCtor early and use the replacement Def when calculating the path_segs. Note that this also changes which def is seen by the code that computes user_self_ty and is_alias_variant_ctor; I don't see a immediate issue with that, but I'm not 100% clear on the implications. Fixes rust-lang#57924 r? @eddyb

@eddyb

Fix generic argument lookup for Self Rewrite the SelfCtor early and use the replacement Def when calculating the path_segs. Note that this also changes which def is seen by the code that computes user_self_ty and is_alias_variant_ctor; I don't see a immediate issue with that, but I'm not 100% clear on the implications. Fixes rust-lang#57924 r? @eddyb

@eddyb

Fix generic argument lookup for Self Rewrite the SelfCtor early and use the replacement Def when calculating the path_segs. Note that this also changes which def is seen by the code that computes user_self_ty and is_alias_variant_ctor; I don't see a immediate issue with that, but I'm not 100% clear on the implications. Fixes rust-lang#57924 r? @eddyb

@eddyb

Fix generic argument lookup for Self Rewrite the SelfCtor early and use the replacement Def when calculating the path_segs. Note that this also changes which def is seen by the code that computes user_self_ty and is_alias_variant_ctor; I don't see a immediate issue with that, but I'm not 100% clear on the implications. Fixes rust-lang#57924 r? @eddyb

@eddyb

Fix generic argument lookup for Self Rewrite the SelfCtor early and use the replacement Def when calculating the path_segs. Note that this also changes which def is seen by the code that computes user_self_ty and is_alias_variant_ctor; I don't see a immediate issue with that, but I'm not 100% clear on the implications. Fixes rust-lang#57924 r? @eddyb

@eddyb

Fix generic argument lookup for Self Rewrite the SelfCtor early and use the replacement Def when calculating the path_segs. Note that this also changes which def is seen by the code that computes user_self_ty and is_alias_variant_ctor; I don't see a immediate issue with that, but I'm not 100% clear on the implications. Fixes rust-lang#57924 r? @eddyb

Rollup of 37 pull requests Successful merges: - #58854 (appveyor: Use VS2017 for all our images) - #58855 (std: Spin for a global malloc lock on wasm32) - #58873 (Fix "Auto-hide item methods documentation" setting) - #58901 (Change `std::fs::copy` to use `copyfile` on MacOS and iOS) - #58933 (Move alloc::prelude::* to alloc::prelude::v1, make alloc a subset of std) - #58938 (core: ensure VaList passes improper_ctypes lint) - #58941 (MIPS: add r6 support) - #58949 (SGX target: Expose thread id function in os module) - #58959 (Add release notes for PR #56243) - #58976 (Default to integrated `rust-lld` linker for UEFI targets) - #59009 (Fix SGX implementations of read/write_vectored.) - #59025 (Fix generic argument lookup for Self) - #59036 (Fix ICE in MIR pretty printing) - #59037 (Avoid some common false positives in intra doc link checking) - #59072 (we can now skip should_panic tests with the libtest harness) - #59079 (add suggestions to invalid macro item error) - #59082 (A few improvements to comments in user-facing crates) - #59102 (Consistent naming for duration_float methods and additional f32 methods) - #59118 (rustc: fix ICE when trait alias has bare Self) - #59139 (Unregress using scalar unions in constants.) - #59146 (Suggest return lifetime when there's only one named lifetime) - #59147 (Make std time tests more robust for platform differences) - #59152 (Stabilize Range*::contains.) - #59156 ([wg-async-await] Add regression test for #55809.) - #59158 (Revert "Don't generate minification variable if minification disabled") - #59169 (Add `-Z allow_features=...` flag) - #59173 (bootstrap: Default to a sensible llvm-suffix.) - #59175 (Don't run test launching `echo` since that doesn't exist on Windows) - #59180 (Use try blocks in rustc_codegen_ssa) - #59185 (No old chestnuts in iter::repeat docs) - #59201 (Remove restriction on isize/usize in repr(simd)) - #59204 (Output diagnostic information for rustdoc) - #59206 (Improved test output) - #59208 (Reduce a Code Repetition Related to Bit Operation) - #59212 (Add x86_64 musl host to the manifest) - #59221 (Option and Result: Add references to documentation of as_ref and as_mut) - #59231 (Stabilize Option::copied)

rust-highfive assigned eddyb Mar 8, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 8, 2019

aoikonomopoulos force-pushed the issue-57924 branch 2 times, most recently from 0eba911 to cf5f46f Compare March 8, 2019 20:27

rust-highfive assigned varkor and unassigned eddyb Mar 12, 2019

varkor approved these changes Mar 12, 2019

View reviewed changes

aoikonomopoulos force-pushed the issue-57924 branch from cf5f46f to c94681f Compare March 13, 2019 00:14

eddyb reviewed Mar 13, 2019

View reviewed changes

aoikonomopoulos force-pushed the issue-57924 branch from c94681f to 311025e Compare March 13, 2019 13:17

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 Mar 13, 2019

pietroalbini mentioned this pull request Mar 13, 2019

Rollup of 18 pull requests #59161

Closed

Centril mentioned this pull request Mar 13, 2019

Rollup of 9 pull requests #59165

Closed

Mark-Simulacrum mentioned this pull request Mar 14, 2019

Rollup of 16 pull requests #59183

Closed

kennytm mentioned this pull request Mar 15, 2019

Rollup of 31 pull requests #59207

Closed

Centril mentioned this pull request Mar 16, 2019

Rollup of 18 pull requests #59223

Closed

kennytm mentioned this pull request Mar 16, 2019

Rollup of 37 pull requests #59226

Merged

bors merged commit 311025e into rust-lang:master Mar 16, 2019

pietroalbini mentioned this pull request May 23, 2019

ICE with incorrect turbofish #60989

Closed

eddyb mentioned this pull request Jun 16, 2019

With a generic struct, Self(x) works where x is of the wrong type argument #61882

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix generic argument lookup for Self #59025

Fix generic argument lookup for Self #59025

aoikonomopoulos commented Mar 8, 2019

petrochenkov commented Mar 12, 2019

varkor left a comment

varkor Mar 12, 2019

aoikonomopoulos Mar 12, 2019

eddyb Mar 13, 2019

aoikonomopoulos Mar 13, 2019

varkor commented Mar 13, 2019

bors commented Mar 13, 2019

Fix generic argument lookup for Self #59025

Fix generic argument lookup for Self #59025

Conversation

aoikonomopoulos commented Mar 8, 2019

petrochenkov commented Mar 12, 2019

varkor left a comment

Choose a reason for hiding this comment

varkor Mar 12, 2019

Choose a reason for hiding this comment

aoikonomopoulos Mar 12, 2019

Choose a reason for hiding this comment

eddyb Mar 13, 2019

Choose a reason for hiding this comment

aoikonomopoulos Mar 13, 2019

Choose a reason for hiding this comment

varkor commented Mar 13, 2019

bors commented Mar 13, 2019