#44493 add structure for inferred_outlives_of #44857

toidiu · 2017-09-26T04:50:55Z

add placeholder for the final implementation of inferred_outlives_of
add some placeholder tests

rust-highfive · 2017-09-26T04:51:11Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @pnkfelix (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

bors · 2017-09-29T20:11:11Z

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

toidiu · 2017-09-29T22:22:08Z

@nikomatsakis I am getting a cryptic error that I dont know how to address.
error: failed to read /checkout/src/tools/rls/test_data/unicødë/Cargo.toml

nvm got some help on irc. rebase was kicking my butt and i had dirty commits

bors · 2017-09-30T13:33:21Z

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

nikomatsakis · 2017-10-03T14:18:18Z

r? @nikomatsakis

nikomatsakis

See if those changes work?

nikomatsakis · 2017-10-03T14:23:03Z

src/librustc_typeck/lib.rs

@@ -315,6 +319,11 @@ pub fn check_crate<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>)
             variance::test::test_variance(tcx));
    })?;

+    tcx.sess.track_errors(|| {


This can be moved up, I think, to occur right after "type collecting"

nikomatsakis · 2017-10-03T14:23:32Z

src/test/compile-fail/outlives-associated-types.rs

+#[rustc_outlives]
+struct Direct<'a, T> {
+    // inferred: `T: 'a`
+    field: &'a T //~ ERROR generic reference may outlive the data it points to


I think the problem is that we are running the test too late in the compiler, and hence we get other unrelated errors being reported.

toidiu · 2017-10-08T20:15:12Z

@nikomatsakis I fixed my error and am getting a failure from other files. Please advise.

failures:
[compile-fail] compile-fail/dep-graph-assoc-type-trans.rs
[compile-fail] compile-fail/dep-graph-caller-callee.rs
[compile-fail] compile-fail/dep-graph-struct-signature.rs
[compile-fail] compile-fail/dep-graph-trait-impl-two-traits-same-method.rs
[compile-fail] compile-fail/dep-graph-trait-impl-two-traits.rs
[compile-fail] compile-fail/dep-graph-trait-impl.rs
[compile-fail] compile-fail/dep-graph-type-alias.rs
[compile-fail] compile-fail/dep-graph-variance-alias.rs
[compile-fail] compile-fail/dep_graph_crosscontaminate_tables.rs
[compile-fail] compile-fail/incr_comp_with_macro_export.rs

nikomatsakis · 2017-10-09T15:00:36Z

src/librustc/ty/maps/mod.rs

@@ -119,6 +119,9 @@ define_maps! { <'tcx>
    /// (inferred) variance.
    [] fn variances_of: ItemVariances(DefId) -> Rc<Vec<ty::Variance>>,

+    /// Maps from def-id of a type to its (inferred) outlives.
+    [] fn inferred_outlives_of: PredicatesOfItem(DefId) -> Vec<ty::Predicate<'tcx>>,


I think your problem is that you are re-using this PredicatesOfItem dep-node. We need to make an InferredOutlivesOf dep-node. This process is not well documented -- it has been actively changing in the last few days! But roughly speaking you need to add a DepNode variant here and then add a line to this big macro here, essentially copying the model of PredicatesOfItem.

nikomatsakis · 2017-10-11T13:34:28Z

@toidiu seems like it doesn't quite build yet, I guess you need to write inferred_outlives_of not outlives_of:

DepKind::InferredOutlivesOf => { force!(inferred_outlives_of, def_id!()); }

bors · 2017-10-16T09:18:40Z

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

nikomatsakis · 2017-10-16T18:15:42Z

@toidiu argh, can you rebase?

…lives. setup some files for upcoming tests

…function of librustc_typeck

dont duplicate error codes choose unlikely error code specify error pattern in test

nikomatsakis · 2017-10-16T18:53:20Z

@bors r+

bors · 2017-10-16T18:53:21Z

📌 Commit 98c6e0a has been approved by nikomatsakis

bors · 2017-10-16T21:30:00Z

⌛ Testing commit 98c6e0a with merge 5618aba...

#44493 add structure for inferred_outlives_of #44493 - add placeholder for the final implementation of inferred_outlives_of - add some placeholder tests

bors · 2017-10-17T00:34:26Z

☀️ Test successful - status-appveyor, status-travis
Approved by: nikomatsakis
Pushing 5618aba to master...

rust-highfive assigned pnkfelix Sep 26, 2017

tbg mentioned this pull request Sep 26, 2017

commitcheck: lint commit messages cockroachdb/cockroach#18782

Closed

arielb1 added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Sep 26, 2017

toidiu force-pushed the ak-44493-empty-predicate branch from 52bb9c4 to 5525973 Compare September 28, 2017 23:33

toidiu force-pushed the ak-44493-empty-predicate branch 4 times, most recently from abfd706 to bb50cd4 Compare September 29, 2017 23:39

toidiu force-pushed the ak-44493-empty-predicate branch from 9306527 to 150d87b Compare October 2, 2017 03:07

rust-highfive assigned nikomatsakis and unassigned pnkfelix Oct 3, 2017

nikomatsakis requested changes Oct 3, 2017

View reviewed changes

toidiu force-pushed the ak-44493-empty-predicate branch 2 times, most recently from 6ef0c56 to 1a4cb46 Compare October 8, 2017 18:45

nikomatsakis approved these changes Oct 9, 2017

View reviewed changes

nikomatsakis requested changes Oct 9, 2017

View reviewed changes

toidiu closed this Oct 11, 2017

toidiu reopened this Oct 11, 2017

toidiu mentioned this pull request Oct 15, 2017

Ak 44493 infer predicate #45298

Merged

8 tasks

toidiu added 2 commits October 16, 2017 14:24

return an empty inferred_outlives_of

f01ee85

add inferred_outlives_of query

32b968c

toidiu added 6 commits October 16, 2017 14:26

create a seperate module for outlives. added a query for inferred_out…

7c8a722

…lives. setup some files for upcoming tests

added components for testing. added outlives test to the check_crate …

ba1efa3

…function of librustc_typeck

add a test case

c021e53

dont duplicate error codes choose unlikely error code specify error pattern in test

add error to the correct line in unit test

fe5cb1a

add a new dep node for outlives

ce754ba

fix function name

98c6e0a

toidiu force-pushed the ak-44493-empty-predicate branch from 0e7f5ce to 98c6e0a Compare October 16, 2017 18:26

bors merged commit 98c6e0a into rust-lang:master Oct 17, 2017

toidiu deleted the ak-44493-empty-predicate branch March 22, 2018 23:36

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

#44493 add structure for inferred_outlives_of #44857

#44493 add structure for inferred_outlives_of #44857

toidiu commented Sep 26, 2017 •

edited

Loading

rust-highfive commented Sep 26, 2017

bors commented Sep 29, 2017

toidiu commented Sep 29, 2017 •

edited

Loading

bors commented Sep 30, 2017

nikomatsakis commented Oct 3, 2017

nikomatsakis left a comment

nikomatsakis Oct 3, 2017

nikomatsakis Oct 3, 2017

toidiu commented Oct 8, 2017

nikomatsakis Oct 9, 2017

nikomatsakis commented Oct 11, 2017

bors commented Oct 16, 2017

nikomatsakis commented Oct 16, 2017

nikomatsakis commented Oct 16, 2017

bors commented Oct 16, 2017

bors commented Oct 16, 2017

bors commented Oct 17, 2017

#44493 add structure for inferred_outlives_of #44857

#44493 add structure for inferred_outlives_of #44857

Conversation

toidiu commented Sep 26, 2017 • edited Loading

rust-highfive commented Sep 26, 2017

bors commented Sep 29, 2017

toidiu commented Sep 29, 2017 • edited Loading

bors commented Sep 30, 2017

nikomatsakis commented Oct 3, 2017

nikomatsakis left a comment

Choose a reason for hiding this comment

nikomatsakis Oct 3, 2017

Choose a reason for hiding this comment

nikomatsakis Oct 3, 2017

Choose a reason for hiding this comment

toidiu commented Oct 8, 2017

nikomatsakis Oct 9, 2017

Choose a reason for hiding this comment

nikomatsakis commented Oct 11, 2017

bors commented Oct 16, 2017

nikomatsakis commented Oct 16, 2017

nikomatsakis commented Oct 16, 2017

bors commented Oct 16, 2017

bors commented Oct 16, 2017

bors commented Oct 17, 2017

toidiu commented Sep 26, 2017 •

edited

Loading

toidiu commented Sep 29, 2017 •

edited

Loading