Skip to content

Simplify gated cfg checking - #34272

Merged
bors merged 1 commit into
rust-lang:masterfrom
jseyfried:simplify_gated_cfg_checking
Jun 17, 2016
Merged

Simplify gated cfg checking#34272
bors merged 1 commit into
rust-lang:masterfrom
jseyfried:simplify_gated_cfg_checking

Conversation

@jseyfried

@jseyfriedjseyfried commented Jun 14, 2016

Copy link
Copy Markdown
Contributor

r? @nrc

nrc
nrc reviewed Jun 16, 2016
View reviewed changes
Comment threadsrc/librustc_driver/driver.rs Outdated

@nrcnrcJun 16, 2016

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Do we need to stop compilation if there were errors here?

@jseyfriedjseyfriedJun 16, 2016

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I don't see any reason to stop compilation -- the only errors that get reported here are malformed cfg attributes (in which case the item is kept), malformed cfg_attr attributes (in which case the attribute is removed), and malformed feature attributes (in which case we might not see the features).
At worst, the user might see some gated feature errors for a feature they intended to use.

@jseyfriedjseyfriedJun 16, 2016•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

(also, gated cfg errors are reported, which definitely don't require us to stop compilation)

@nrc

nrc commented Jun 16, 2016

Copy link
Copy Markdown
Member

@bors: r+

@bors

bors commented Jun 16, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit 80292a8 has been approved by nrc

@bors

bors commented Jun 16, 2016

Copy link
Copy Markdown
Collaborator

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

@jseyfried
jseyfriedforce-pushed the simplify_gated_cfg_checking branch from 80292a8 to 64be754CompareJune 16, 2016 17:33
@bors

bors commented Jun 16, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit 64be754 has been approved by nrc

@jseyfried
jseyfriedforce-pushed the simplify_gated_cfg_checking branch from 64be754 to 92a9405CompareJune 16, 2016 18:31
@bors

bors commented Jun 16, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit 92a9405 has been approved by nrc

@jseyfried
jseyfriedforce-pushed the simplify_gated_cfg_checking branch from 92a9405 to 2cd6ccfCompareJune 16, 2016 19:43
@jseyfried

jseyfried commented Jun 16, 2016

Copy link
Copy Markdown
ContributorAuthor

@bors r=nrc

@bors

bors commented Jun 16, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit 2cd6ccf has been approved by nrc

@bors

bors commented Jun 16, 2016

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 2cd6ccf with merge f911d87...

bors added a commit that referenced this pull request Jun 16, 2016
@bors
Auto merge of#34272- jseyfried:simplify_gated_cfg_checking, r=nrc
f911d87
Simplify gated cfg checking
r? @nrc
@bors

bors commented Jun 17, 2016

Copy link
Copy Markdown
Collaborator

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-32cross-opt, auto-linux-64-cargotest, auto-linux-64-cross-armhf, auto-linux-64-cross-armsf, auto-linux-64-cross-freebsd, auto-linux-64-cross-netbsd, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-mir, auto-linux-64-opt-rustbuild, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-mac-64-opt-rustbuild, auto-mac-cross-ios-opt, auto-win-gnu-32-nopt-t, auto-win-gnu-32-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-nopt-t, auto-win-gnu-64-opt, auto-win-msvc-32-cross-opt, auto-win-msvc-32-opt, auto-win-msvc-64-cargotest, auto-win-msvc-64-opt, auto-win-msvc-64-opt-mir, auto-win-msvc-64-opt-rustbuild

@bors
bors merged commit 2cd6ccf into rust-lang:masterJun 17, 2016
@borsbors mentioned this pull request Jun 17, 2016
Closed
This was referenced Jun 21, 2016
Closed
Closed
This was referenced Jul 21, 2016
Merged
Closed
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 28, 2016
@Manishearth
Rollup merge ofrust-lang#34969- jseyfried:fix_cfg_feature, r=nrc
f540f5d
Avoid processing `feature`s on unconfigured crates
Fixesrust-lang#34932, a regression caused by rust-lang#34272.
r? @nrc
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@nrcnrc

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@jseyfried@nrc@bors