https://github.com/rust-lang/rust http://git.dreamy.place/mirrors/rust/atom?h=1.60.0 2022-02-18T03:18:42+00:00 2022-02-18T03:18:42+00:00 Michael Goulet michael@errs.io 2022-02-18T03:18:42+00:00 urn:sha1:207fb5f070174368ebb56a17b6f4e5a161cabe51 2022-02-18T02:45:53+00:00 Michael Goulet michael@errs.io 2022-01-12T03:00:34+00:00 urn:sha1:f04f732503a239b3fac22be2238d21971aa03dce 2022-02-12T13:39:52+00:00 Matthew Jasper mjjasper1@gmail.com 2022-02-09T10:19:31+00:00 urn:sha1:f718b516900105ccfce2b32c915b3c3b1a136a1c 2022-02-11T07:18:06+00:00 Oli Scherer git-spam-no-reply9815368754983@oli-obk.de 2022-02-11T07:18:06+00:00 urn:sha1:d54195db22421c51fd14560aba3bbf9b79a52677 This reverts commit e7cc3bddbe0d0e374d05e7003e662bba1742dbae, reversing changes made to 734368a200904ef9c21db86c595dc04263c87be0. 2022-02-11T07:17:16+00:00 Oli Scherer git-spam-no-reply9815368754983@oli-obk.de 2022-02-11T07:17:16+00:00 urn:sha1:2d8b8f359312210e34b251906179484ffc7287c6 This reverts commit 1f0a96862ac9d4c6ca3e4bb500c8b9eac4d83049, reversing changes made to bf242bb1199e25ca2274df5c4114e0c9436b74e9. 2022-02-11T07:14:58+00:00 Oli Scherer git-spam-no-reply9815368754983@oli-obk.de 2022-02-11T07:14:58+00:00 urn:sha1:7a71b7a99e6744097c1882a785f88e1aac3acfa0 This reverts commit 239f1e716dcb1e145b5df5f9439524c817d123b2. 2022-02-09T09:41:48+00:00 bors bors@rust-lang.org 2022-02-09T09:41:48+00:00 urn:sha1:1f0a96862ac9d4c6ca3e4bb500c8b9eac4d83049 Improve opaque type higher-ranked region error message under NLL Currently, any higher-ranked region errors involving opaque types fall back to a generic "higher-ranked subtype error" message when run under NLL. This PR adds better error message handling for this case, giving us the same kinds of error messages that we currently get without NLL: ``` error: implementation of `MyTrait` is not general enough --> $DIR/opaque-hrtb.rs:12:13 | LL | fn foo() -> impl for<'a> MyTrait<&'a str> { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ implementation of `MyTrait` is not general enough | = note: `impl MyTrait<&'2 str>` must implement `MyTrait<&'1 str>`, for any lifetime `'1`... = note: ...but it actually implements `MyTrait<&'2 str>`, for some specific lifetime `'2` error: aborting due to previous error ``` To accomplish this, several different refactoring needed to be made: * We now have a dedicated `InstantiateOpaqueType` struct which implements `TypeOp`. This is used to invoke `instantiate_opaque_types` during MIR type checking. * `TypeOp` is refactored to pass around a `MirBorrowckCtxt`, which is needed to report opaque type region errors. * We no longer assume that all `TypeOp`s correspond to canonicalized queries. This allows us to properly handle opaque type instantiation (which does not occur in a query) as a `TypeOp`. A new `ErrorInfo` associated type is used to determine what additional information is used during higher-ranked region error handling. * The body of `try_extract_error_from_fulfill_cx` has been moved out to a new function `try_extract_error_from_region_constraints`. This allows us to re-use the same error reporting code between canonicalized queries (which can extract region constraints directly from a fresh `InferCtxt`) and opaque type handling (which needs to take region constraints from the pre-existing `InferCtxt` that we use throughout MIR borrow checking). 2022-02-08T17:35:42+00:00 Aaron Hill aa1ronham@gmail.com 2021-12-19T00:06:53+00:00 urn:sha1:48a48fd1b85ce50a890303b7238550ccf0613433 Currently, any higher-ranked region errors involving opaque types fall back to a generic "higher-ranked subtype error" message when run under NLL. This PR adds better error message handling for this case, giving us the same kinds of error messages that we currently get without NLL: ``` error: implementation of `MyTrait` is not general enough --> $DIR/opaque-hrtb.rs:12:13 | LL | fn foo() -> impl for<'a> MyTrait<&'a str> { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ implementation of `MyTrait` is not general enough | = note: `impl MyTrait<&'2 str>` must implement `MyTrait<&'1 str>`, for any lifetime `'1`... = note: ...but it actually implements `MyTrait<&'2 str>`, for some specific lifetime `'2` error: aborting due to previous error ``` To accomplish this, several different refactoring needed to be made: * We now have a dedicated `InstantiateOpaqueType` struct which implements `TypeOp`. This is used to invoke `instantiate_opaque_types` during MIR type checking. * `TypeOp` is refactored to pass around a `MirBorrowckCtxt`, which is needed to report opaque type region errors. * We no longer assume that all `TypeOp`s correspond to canonicalized queries. This allows us to properly handle opaque type instantiation (which does not occur in a query) as a `TypeOp`. A new `ErrorInfo` associated type is used to determine what additional information is used during higher-ranked region error handling. * The body of `try_extract_error_from_fulfill_cx` has been moved out to a new function `try_extract_error_from_region_constraints`. This allows us to re-use the same error reporting code between canonicalized queries (which can extract region constraints directly from a fresh `InferCtxt`) and opaque type handling (which needs to take region constraints from the pre-existing `InferCtxt` that we use throughout MIR borrow checking). 2022-02-08T17:01:33+00:00 Oli Scherer git-spam-no-reply9815368754983@oli-obk.de 2022-02-08T16:47:24+00:00 urn:sha1:239f1e716dcb1e145b5df5f9439524c817d123b2 2022-02-02T15:40:12+00:00 Oli Scherer git-spam-no-reply9815368754983@oli-obk.de 2022-02-01T17:28:46+00:00 urn:sha1:7f608eb9edb38ff271ff5be50dbbbb424cbf348f