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

Mini rollup #20760

Merged
merged 33 commits into from
Jan 8, 2015
Merged

Mini rollup #20760

merged 33 commits into from
Jan 8, 2015

Conversation

alexcrichton
Copy link
Member

No description provided.

akosthekiss and others added 30 commits January 8, 2015 07:12
This gets rid of the 'experimental' level, removes the non-staged_api
case (i.e. stability levels for out-of-tree crates), and lets the
staged_api attributes use 'unstable' and 'deprecated' lints.

This makes the transition period to the full feature staging design
a bit nicer.
Most of the file lost one level of indentation in a recent rollup. Most
likely an accident during merge conflict resolution.
an `Option<&Expr>` like everything else.
more modern terminology and update tests accordingly.
… implicit

deref that is associated with an overloaded index, we should not
consult the method lookup table. This deref is *always* a deref of an
`&T` and hence is never overloaded (and is also not present in the
tables; it has no "id" or other associated key).
`assert_no_late_bound_regions`) and to give more helpful debug output.
This adds the int_uint feature to *every* library, whether or not it
needs it.
This pulls all of our long-form documentation into a single document,
nicknamed "the book" and formally titled "The Rust Programming
Language."

A few things motivated this change:

* People knew of The Guide, but not the individual Guides. This merges
  them together, helping discoverability.
* You can get all of Rust's longform documentation in one place, which
  is nice.
* We now have rustbook in-tree, which can generate this kind of
  documentation. While its style is basic, the general idea is much
  better: a table of contents on the left-hand side.
* Rather than a almost 10,000-line guide.md, there are now smaller files
  per section.
An updated version of rust-lang#19461

This version vendors steveklabnik/rustbook@731f7bf and builds it when building the docs. This is almost great, except my `make`-foo is poor, so I have my own personal paths in `mk/docs.mk`. How should I best get around that?

/cc @brson
This gets rid of the 'experimental' level, removes the non-staged_api
case (i.e. stability levels for out-of-tree crates), and lets the
staged_api attributes use 'unstable' and 'deprecated' lints.

This makes the transition period to the full feature staging design
a bit nicer.
[breaking-change] code using this feature will break.
Most of the file lost one level of indentation in a recent rollup. Most
likely an accident during merge conflict resolution.
Conflicts:
	src/test/compile-fail/borrowck-move-out-of-overloaded-auto-deref.rs
	src/test/compile-fail/issue-2590.rs
	src/test/compile-fail/lint-stability.rs
	src/test/compile-fail/slice-mut-2.rs
	src/test/compile-fail/std-uncopyable-atomics.rs
@rust-highfive
Copy link
Collaborator

r? @brson

(rust_highfive has picked a reviewer for you, use r? to override)

@alexcrichton
Copy link
Member Author

All builders for this PR have passed, but it looks like buildbot got confused (or I messed something up) and the auto-mac-64-opt builder was not triggered as it looks like bors won't be merging this as a result of that (and I'd rather not re-test), I'm going to merge this manually.

@alexcrichton alexcrichton merged commit 7541f82 into rust-lang:master Jan 8, 2015
@alexcrichton alexcrichton deleted the rollup branch January 8, 2015 20:45
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup
Projects
None yet
Development

Successfully merging this pull request may close these issues.