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

tidy/features: fix checking of lang features #37196

Merged
merged 2 commits into from
Oct 28, 2016

Conversation

tamird
Copy link
Contributor

@tamird tamird commented Oct 15, 2016

r? @brson

See the commit messages - the actual "fixes" here are strawmen; I'm happy to adjust them if you have suggestions.

@@ -286,7 +286,6 @@ pub mod builtin {
/// // fn concat_idents!(new, fun, name) { } // not usable in this way!
/// # }
/// ```
#[unstable(feature = "concat_idents", issue = "29599")]
Copy link
Member

Choose a reason for hiding this comment

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

This was added in #34404 so the macro is marked unstable in the docs. If the feature name is conflicting then it should just be renamed here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

@tamird tamird force-pushed the fix-tidy-features branch from 59e9f57 to 5f1aa61 Compare October 15, 2016 22:40
@tamird
Copy link
Contributor Author

tamird commented Oct 27, 2016

@brson ping?

@brson
Copy link
Contributor

brson commented Oct 27, 2016

@tamird Hi! Sorry for not seeing this earlier. This looks great. Do you mind adding an assert that some lang features are found, so that this doesn't regress again in the future?

`git ls-files` now exits zero when called with a missing file; check
that the file is included in the output before reporting a checked-in
binary. Observed with git 2.10.1 and tripped by a symlink created by
tests:

src/test/run-make/issue-26006/out/time/deps/liblibc.rlib -> out/libc/liblibc.rlib
Removes the `STATUSES` static which duplicates truth from the pattern
match in `collect_lang_features`.

Fixes existing duplicates by renaming:
- never_type{,_impls} on `impl`s on `!`
- concat_idents{,_macro} on `macro_rules! concat_idents`

Fixes rust-lang#37013.
@tamird tamird force-pushed the fix-tidy-features branch from 5f1aa61 to bef1911 Compare October 28, 2016 01:36
@tamird
Copy link
Contributor Author

tamird commented Oct 28, 2016

Yep! Done.

@brson
Copy link
Contributor

brson commented Oct 28, 2016

@bors r+

@bors
Copy link
Collaborator

bors commented Oct 28, 2016

📌 Commit bef1911 has been approved by brson

@bors
Copy link
Collaborator

bors commented Oct 28, 2016

⌛ Testing commit bef1911 with merge 36d7467...

bors added a commit that referenced this pull request Oct 28, 2016
tidy/features: fix checking of lang features

r? @brson

See the commit messages - the actual "fixes" here are strawmen; I'm happy to adjust them if you have suggestions.
@bors bors merged commit bef1911 into rust-lang:master Oct 28, 2016
@tamird tamird deleted the fix-tidy-features branch October 28, 2016 17:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants