Skip to content

Rolling up PRs in the queue #17725

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

Merged
merged 62 commits into from
Oct 3, 2014
Merged

Rolling up PRs in the queue #17725

merged 62 commits into from
Oct 3, 2014

Conversation

alexcrichton
Copy link
Member

No description provided.

bkoropoff and others added 30 commits September 30, 2014 20:07
CFG_RELEASE, CFG_VER_HASH and CFG_VER_DATE were only available as an output
to stdout from the driver::version() function that had an inconvenient
signature.
Mention that using `pub` is called exporting.

Remove that `use` is called re-exporting, because `pub use` should be
called re-exporting. The guide currently doesn't cover `pub use`.
Remove superfluous parentheses from the CTAGS_LOCATIONS expression.
Fixes the following error when executing `make TAGS.vi`:

    /bin/sh: -c: line 0: syntax error near unexpected token `)'
This also requires a fix for Vec's MoveItems. This resolves issue rust-lang#16941
Conflicts:
	src/libcollections/lib.rs
	src/libcore/lib.rs
	src/librustdoc/lib.rs
	src/librustrt/lib.rs
	src/libserialize/lib.rs
	src/libstd/lib.rs
	src/test/run-pass/issue-8898.rs
Instead, only run `make tidy`. The tidy script can run quite quickly, and it's
super annoying to run tests for 50 minutes only to have bors fail with a
"trailing whitespace" error.
@rust-highfive
Copy link
Contributor

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!

Conflicts:
	.travis.yml
@bors bors closed this Oct 3, 2014
@bors bors merged commit d911936 into rust-lang:master Oct 3, 2014
@alexcrichton alexcrichton deleted the rollup branch October 3, 2014 13:54
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.