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.

Sign up for GitHub

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

Add a convenience method on TyCtxt for checking for thread locals #71465

Merged
merged 5 commits into from
May 1, 2020
+17 −13
Merged

Add a convenience method on TyCtxt for checking for thread locals #71465

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
582d52f
Separate miri/ctfe unsupported operations
oli-obk Apr 16, 2020
b2395a5
Add a convenience function for testing whether a static is `#[thread_…
oli-obk Apr 17, 2020
a91bad6
Highlight an error that can only happen in CTFE
oli-obk Apr 30, 2020
9cdc932
Address review comments
oli-obk Apr 30, 2020
8079dd8
A test now fails during check instead of build
oli-obk Apr 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Separate miri/ctfe unsupported operations
@oli-obk
oli-obk committed Apr 30, 2020
commit 582d52f0bdead9f40600d468bbe8c3be7842248a
2 changes: 2 additions & 0 deletions src/librustc_middle/mir/interpret/error.rs
View file
Original file line number Diff line number Diff line change
@@ -451,6 +451,8 @@ pub enum UnsupportedOpInfo {
NoMirFor(DefId),
/// Encountered a pointer where we needed raw bytes.
ReadPointerAsBytes,

// The variants below are only reachable from CTFE/const prop, miri will never emit them.
Copy link
Member

Choose a reason for hiding this comment

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

Please leave an empty line above and below, otherwise this "melds" into the following doc-comment.

Also while you are at it, could you fix the doc-comment for the enum itself?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Rustfmt eats that line. I did have that line ;)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

do you want me to rustfmt skip the enum?

Copy link
Member

Choose a reason for hiding this comment

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

Seriously, rustfmt is getting annoying. :/

Maybe then format it like that:

//
// text
//

or does rustfmt also remove empty comments?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yea that worked

/// Encountered raw bytes where we needed a pointer.
ReadBytesAsPointer,
}