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

Jump to bottom

Renamed LIBDIR_RELATIVE to CFG_LIBDIR_RELATIVE #11521

Merged
merged 1 commit into from
Jan 15, 2014
Merged

Renamed LIBDIR_RELATIVE to CFG_LIBDIR_RELATIVE #11521

merged 1 commit into from
Jan 15, 2014

Conversation

dguenther
Copy link
Contributor

Renamed LIBDIR_RELATIVE to CFG_LIBDIR_RELATIVE. It's not a configurable variable, but it looks out of place without the CFG_ prefix.

Fixes #11420

@alexcrichton
Copy link
Member

Are you sure that this still compiles? This logic needs to make it down into the makefiles and I thought that it got into config.mk throught putvar.

@dguenther
Copy link
Contributor Author

You're right, it doesn't compile. I'm embarrassed to admit it, but I got too eager to submit a PR. Looking into this more, I'm not sure it makes sense to just remove it altogether, as we'd have to parse it out of CFG_LIBDIR every time we wanted access to it. I thought about hiding variables without the CFG_ prefix from output, but that feels like a hack to me. Would renaming it to CFG_LIBDIR_RELATIVE, as originally suggested, be enough?

@alexcrichton
Copy link
Member

Morally speaking, renaming isn't right (because you can't configure it), but implementation-wise, I think renaming is fine.

@dguenther
Copy link
Contributor Author

All right, I renamed LIBDIR_RELATIVE to CFG_LIBDIR_RELATIVE and updated the PR. Compiled and ran tests this time.

@alexcrichton
Copy link
Member

Could you squash the two commits together? Otherwise looks good to me!

@dguenther
Copy link
Contributor Author

Done, thanks!

bors added a commit that referenced this pull request Jan 14, 2014
@bors
auto merge of #11521 : dguenther/rust/hide_libdir_relative, r=alexcri…
dd8b011 
…chton

Renamed `LIBDIR_RELATIVE` to `CFG_LIBDIR_RELATIVE`. It's not a configurable variable, but it looks out of place without the `CFG_` prefix.

Fixes #11420
@bors bors closed this Jan 15, 2014
@bors bors merged commit a599d89 into rust-lang:master Jan 15, 2014
@dguenther dguenther deleted the hide_libdir_relative branch January 15, 2014 01:05
flip1995 pushed a commit to flip1995/rust that referenced this pull request Oct 21, 2023
@bors
Auto merge of rust-lang#11521 - y21:issue9122, r=llogiq
e230f19 
[`map_identity`]: allow closure with type annotations

Fixes rust-lang#9122

`.map(|a: u32| a)` can help type inference, so we should probably allow this and not warn about "unnecessary map of the identity function"

changelog: [`map_identity`]: allow closure with type annotations
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Rename LIBDIR_RELATIVE to CFG_LIBDIR_RELATIVE
3 participants
@dguenther @alexcrichton @bors