minor: Sync from rust #14767
Closed
minor: Sync from rust #14767
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
the
S-waiting-on-review
lnicola
commented
May 9, 2023
| @@ -39,7 +39,7 @@ fn benchmark_parser() { | |||
| let _b = bench("parsing"); | |||
| let p = SourceFile::parse(&data); | |||
| assert!(p.errors.is_empty()); | |||
| assert_eq!(p.tree().syntax.text_range().len(), 352474.into()); | |||
| assert_eq!(p.tree().syntax.text_range().len(), 352458.into()); | |||
There was a problem hiding this comment.
Because of the fmt changes, maybe?
This reverts commit abc0660118cc95f47445fd33502a11dd448f5968.
This function/lang_item was introduced in #104321 as a temporary workaround of future lowering. The usage and need for it went away in #104833. After a bootstrap update, the function itself can be removed from `std`.
|
Dropped the two commits from rust-lang/rust#109002 because they break building against the stable sysroot. |
|
Actually, according to #13676 (comment), it seems we can't drop commits that way. |
|
Hmm, can we add those commits and merge them in without CI approval? Then fix them up afterwards? |
|
Ahh nevermind I see the issue now |
|
Yes, but we'll have to propagate our "fix" downstream, if it involves changing the code there 😄 . |
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.
No description provided.