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

Add @__DIR__ macro. #281

Merged
merged 2 commits into from
Sep 8, 2016
Merged

Add @__DIR__ macro. #281

merged 2 commits into from
Sep 8, 2016

Conversation

helgee
Copy link
Contributor

@helgee helgee commented Sep 7, 2016

Another nightly PR but this time with a branch and all...

@@ -1463,4 +1463,9 @@ if VERSION < v"0.6.0-dev.374"
end
end

if VERSION < v"0.6.0-dev.404"
Copy link
Contributor

Choose a reason for hiding this comment

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

did you run the commit-name script at the merge commit?

Copy link
Contributor

Choose a reason for hiding this comment

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

This should probably be !isdefined(Base, Symbol("@__DIR__")) for clarity

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@tkelman yes. Since CI says that it was wrong, how do I do it correctly? Or should I use @TotalVerb's suggestion?

Copy link
Contributor

Choose a reason for hiding this comment

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

isdefined sounds fine to me. Suggests there may be a bug in that script though...

Copy link
Contributor

@tkelman tkelman Sep 8, 2016

Choose a reason for hiding this comment

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

hm, I get

$ git checkout -q 11ff9abd013e8c8f745616057c1076e6c6b761c5 && contrib/commit-name.sh
0.6.0-dev.528

at the merge commit JuliaLang/julia@11ff9ab

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Obviously I did not run it at the merge commit. Sorry, my bad!

Copy link
Contributor

Choose a reason for hiding this comment

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

#281 (comment) is still better

@helgee
Copy link
Contributor Author

helgee commented Sep 8, 2016

With the correct version CI passes 👍

@tkelman tkelman merged commit 24793ed into JuliaLang:master Sep 8, 2016
@helgee helgee deleted the dirmacro branch September 11, 2016 15:07
dpsanders pushed a commit to dpsanders/Compat.jl that referenced this pull request Feb 1, 2017
* Add @__DIR__ macro.

* Correct version number.
martinholters added a commit that referenced this pull request Aug 31, 2018
martinholters added a commit that referenced this pull request Aug 31, 2018
stevengj pushed a commit that referenced this pull request Sep 5, 2018
* Remove `take!(::Task)` definition for Julia versions prior to 0.6

Was added in #307.

* Remove `redirect_std*(f, stream)` definitions for Julia prior to v0.6

Were added in #275.

* Remove at-__DIR__ macro definition for Julia versions prior to 0.6

Was added in #281.

* Remove `broadcast` definition for equal-length tuples

Was added in #324 and #328

* Remove definitions of `unsafe_get` and `isnull` fallsback

Were added in #287.

* Remove defintions of `xor` and `⊻`

Were added in #289.

* Definitions of `numerator` and `denominator`

Were added in #290.

* Remove defintion of `iszero`

Was added in #305.

* Remove definition of `>:`

Was added in #336

* Remove definition of `take!(::Base.AbstractIOBuffer)`

Was added in #290.

* Remove definiton of `.&` and `.|`

Were added in #306.

* Remove definition of `Compat.isapprox`

Was added in #309.
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