Add AST support for unsafe binders #134140
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
S-waiting-on-review
|
Some changes occurred in src/tools/rustfmt cc @rust-lang/rustfmt Some changes occurred in src/tools/clippy cc @rust-lang/clippy HIR ty lowering was modified cc @fmease |
ytmimi
reviewed
Dec 10, 2024
Comment on lines
+1019
to
+1043
| ast::TyKind::UnsafeBinder(ref binder) => { | ||
| let mut result = String::new(); | ||
| if let Some(ref lifetime_str) = | ||
| rewrite_bound_params(context, shape, &binder.generic_params) | ||
| { | ||
| result.push_str("unsafe<"); | ||
| result.push_str(lifetime_str); | ||
| result.push_str("> "); | ||
| } | ||
|
|
||
| let inner_ty_shape = if context.use_block_indent() { | ||
| shape | ||
| .offset_left(result.len()) | ||
| .max_width_error(shape.width, self.span())? | ||
| } else { | ||
| shape | ||
| .visual_indent(result.len()) | ||
| .sub_width(result.len()) | ||
| .max_width_error(shape.width, self.span())? | ||
| }; | ||
|
|
||
| let rewrite = binder.inner_ty.rewrite_result(context, inner_ty_shape)?; | ||
| result.push_str(&rewrite); | ||
| Ok(result) | ||
| } |
There was a problem hiding this comment.
can you add a rustfmt test case for #![feature(unsafe_binders)].
oli-obk
reviewed
Dec 11, 2024
compiler/rustc_hir/src/hir.rs
Outdated
| @@ -2878,6 +2886,8 @@ pub enum TyKind<'hir> { | |||
| Ref(&'hir Lifetime, MutTy<'hir>), | |||
| /// A bare function (e.g., `fn(usize) -> bool`). | |||
| BareFn(&'hir BareFnTy<'hir>), | |||
| /// Uwu | |||
oli-obk
changed the title
compiler-errors
force-pushed
the
unsafe-binders-ast
branch
from
431d5fe to
81b31f4
Compare
|
☔ The latest upstream changes (presumably #134164) made this pull request unmergeable. Please resolve the merge conflicts. |
compiler-errors
force-pushed
the
unsafe-binders-ast
branch
from
81b31f4 to
86e9836
Compare
oli-obk
added
S-waiting-on-author
|
r=me with rustfmt test and docs |
compiler-errors
force-pushed
the
unsafe-binders-ast
branch
from
86e9836 to
b8c5a0f
Compare
|
@bors r=oli-obk |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 13, 2024
…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#133900 (Advent of `tests/ui` (misc cleanups and improvements) [1/N]) - rust-lang#133937 (Keep track of parse errors in `mod`s and don't emit resolve errors for paths involving them) - rust-lang#133938 (`rustc_mir_dataflow` cleanups, including some renamings) - rust-lang#134058 (interpret: reduce usage of TypingEnv::fully_monomorphized) - rust-lang#134130 (Stop using driver queries in the public API) - rust-lang#134140 (Add AST support for unsafe binders) - rust-lang#134229 (Fix typos in docs on provenance) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 13, 2024
…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#133900 (Advent of `tests/ui` (misc cleanups and improvements) [1/N]) - rust-lang#133937 (Keep track of parse errors in `mod`s and don't emit resolve errors for paths involving them) - rust-lang#133938 (`rustc_mir_dataflow` cleanups, including some renamings) - rust-lang#134058 (interpret: reduce usage of TypingEnv::fully_monomorphized) - rust-lang#134130 (Stop using driver queries in the public API) - rust-lang#134140 (Add AST support for unsafe binders) - rust-lang#134229 (Fix typos in docs on provenance) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 14, 2024
Rollup merge of rust-lang#134140 - compiler-errors:unsafe-binders-ast, r=oli-obk Add AST support for unsafe binders I'm splitting up rust-lang#130514 into pieces. It's impossible for me to keep up with a huge PR like that. I'll land type system support for this next, probably w/o MIR lowering, which will come later. r? `@oli-obk` cc `@BoxyUwU` and `@lcnr` who also may want to look at this, though this PR doesn't do too much yet
flip1995
pushed a commit
to flip1995/rust
that referenced
this pull request
Dec 15, 2024
…, r=oli-obk Add AST support for unsafe binders I'm splitting up rust-lang#130514 into pieces. It's impossible for me to keep up with a huge PR like that. I'll land type system support for this next, probably w/o MIR lowering, which will come later. r? `@oli-obk` cc `@BoxyUwU` and `@lcnr` who also may want to look at this, though this PR doesn't do too much yet
flip1995
pushed a commit
to flip1995/rust
that referenced
this pull request
Dec 15, 2024
…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#133900 (Advent of `tests/ui` (misc cleanups and improvements) [1/N]) - rust-lang#133937 (Keep track of parse errors in `mod`s and don't emit resolve errors for paths involving them) - rust-lang#133938 (`rustc_mir_dataflow` cleanups, including some renamings) - rust-lang#134058 (interpret: reduce usage of TypingEnv::fully_monomorphized) - rust-lang#134130 (Stop using driver queries in the public API) - rust-lang#134140 (Add AST support for unsafe binders) - rust-lang#134229 (Fix typos in docs on provenance) r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I'm splitting up #130514 into pieces. It's impossible for me to keep up with a huge PR like that. I'll land type system support for this next, probably w/o MIR lowering, which will come later.
r? @oli-obk
cc @BoxyUwU and @lcnr who also may want to look at this, though this PR doesn't do too much yet
Tracking: