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

TOML: ignore path references with wildcards to avoid false positives #7403

Merged
merged 1 commit into from Jul 8, 2021

Conversation

Kobzol
Copy link
Member

@Kobzol Kobzol commented Jun 24, 2021

Fixes: #7402

changelog: Ignore paths with wildcards in TOML to avoid false positives.

@Kobzol Kobzol added the fix Pull requests that fix some bug(s) label Jun 24, 2021
@Kobzol Kobzol added this to In Progress in To test via automation Jun 24, 2021
@Kobzol Kobzol force-pushed the toml-ignore-wildcard-in-path branch from ae67ea0 to 3f36339 Compare June 25, 2021 09:25
@Kobzol
Copy link
Member Author

Kobzol commented Jun 25, 2021

I see. I changed it so that any references after and including the first glob reference are ignored inside workspace members.
I'm not sure how to use the createRegex function though, it didn't seem to create a regex that would recognize a glob pattern.

Copy link
Member

@Undin Undin left a comment

Choose a reason for hiding this comment

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

I see. I changed it so that any references after and including the first glob reference are ignored inside workspace members.
I'm not sure how to use the createRegex function though, it didn't seem to create a regex that would recognize a glob pattern.

Sorry for the confusion. I meant that createRegex can be used as an example of parsing implementation if we need it. But parsing reduced to several contains

@Kobzol Kobzol force-pushed the toml-ignore-wildcard-in-path branch 2 times, most recently from 3e0733f to 4d14600 Compare July 5, 2021 21:23
@Kobzol Kobzol force-pushed the toml-ignore-wildcard-in-path branch from 4d14600 to 98d17c8 Compare July 5, 2021 21:24
Copy link
Member

@Undin Undin left a comment

Choose a reason for hiding this comment

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

Thanks!
bors r+

bors bot added a commit that referenced this pull request Jul 7, 2021
7403: TOML: ignore path references with wildcards to avoid false positives r=Undin a=Kobzol

Fixes: #7402

changelog: Ignore paths with wildcards in TOML to avoid false positives.

7427: Reset crates local index state if index is empty r=Undin a=avrong

Reset the last commit hash of the index if the index PersistentHashMap size is 0.

This will fix the issues when the index file has been deleted or did not move with the state, e.g. when the latest IDE release copied the state without index map

7449: REF: Handle root modules in "Promote module to directory" refactoring r=ortem a=dima74

Fixes #7041

changelog: Correctly handle root modules in "Promote module to directory" refactoring


Co-authored-by: Jakub Beránek <berykubik@gmail.com>
Co-authored-by: Aleksei Trifonov <avrong@avrong.me>
Co-authored-by: Dmitry Murzin <diralik@yandex.ru>
@bors
Copy link
Contributor

bors bot commented Jul 7, 2021

This PR was included in a batch that timed out, it will be automatically retried

@Undin
Copy link
Member

Undin commented Jul 8, 2021

bors retry

@bors bors bot merged commit 3402dfe into intellij-rust:master Jul 8, 2021
@bors
Copy link
Contributor

bors bot commented Jul 8, 2021

Build succeeded:

To test automation moved this from In Progress to Test Jul 8, 2021
@github-actions github-actions bot added this to the v151 milestone Jul 8, 2021
@Kobzol Kobzol deleted the toml-ignore-wildcard-in-path branch July 8, 2021 08:51
@neonaot neonaot self-assigned this Aug 11, 2021
@neonaot neonaot moved this from Test to Done in To test Aug 13, 2021
@neonaot neonaot removed their assignment Aug 13, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
fix Pull requests that fix some bug(s)
Projects
To test
  
Done
Development

Successfully merging this pull request may close these issues.

False-positive Can't resolve warnings in Cargo.toml
3 participants