Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

minor : fixes for ratoml module #17483

Merged
merged 4 commits into from
Jul 23, 2024
Merged

minor : fixes for ratoml module #17483

merged 4 commits into from
Jul 23, 2024

Conversation

alibektas
Copy link
Member

@alibektas alibektas commented Jun 23, 2024

This is a follow-up PR to #17058.

  • Parse errors are reflected as such by defining a new variant called ConfigError::ParseError
  • New error collection has been added to store config level agnostic errors.

EDIT : Some things that this PR promised to solve are removed and will be addressed by other PRs

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 23, 2024
@alibektas
Copy link
Member Author

// FIXME: This should be an error
[cargo.sysroot]
non-table = "expected"

I would also like to ( since it is relevant to this issue ) ask why this is supposed to be an error. If my assumption is correct it is related to the hyphenated key. If that's the case toml actually allows such keys.

@alibektas alibektas force-pushed the ratoml/fixes branch 3 times, most recently from c81594d to 630dc63 Compare June 23, 2024 22:29
crates/rust-analyzer/src/config.rs Outdated Show resolved Hide resolved
crates/rust-analyzer/src/config.rs Show resolved Hide resolved
crates/rust-analyzer/src/main_loop.rs Outdated Show resolved Hide resolved
@Veykril Veykril added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 24, 2024
@bors
Copy link
Contributor

bors commented Jun 24, 2024

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

@Veykril
Copy link
Member

Veykril commented Jul 1, 2024

// FIXME: This should be an error
[cargo.sysroot]
non-table = "expected"

I would also like to ( since it is relevant to this issue ) ask why this is supposed to be an error. If my assumption is correct it is related to the hyphenated key. If that's the case toml actually allows such keys.

Sprry forgot to reply to this. the error here is that sysroot isn't a table config, so the the non-table key being used here should error

@alibektas alibektas mentioned this pull request Jul 4, 2024
5 tasks
- Parse errors are reflected as such by defining a new variant called `ConfigError::ParseError`
- New error collection has been added to store config level agnostic errors.
@alibektas alibektas added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 22, 2024
/// traversing through `global` configs and the `client` config. However the non-null value constraint
/// is config level agnostic, so this requires an independent error storage
/// FIXME : bad name I know...
other_errors: ConfigErrors,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

validation_errors?

@Veykril
Copy link
Member

Veykril commented Jul 22, 2024

@bors delegate+

@bors
Copy link
Contributor

bors commented Jul 22, 2024

✌️ @alibektas, you can now approve this pull request!

If @Veykril told you to "r=me" after making some further change, please make that change, then do @bors r=@Veykril

@alibektas
Copy link
Member Author

@bors r+

@bors
Copy link
Contributor

bors commented Jul 23, 2024

📌 Commit 784d46e has been approved by alibektas

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Jul 23, 2024

⌛ Testing commit 784d46e with merge 7507695...

@bors
Copy link
Contributor

bors commented Jul 23, 2024

☀️ Test successful - checks-actions
Approved by: alibektas
Pushing 7507695 to master...

@bors bors merged commit 7507695 into rust-lang:master Jul 23, 2024
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants