Commit Graph

48629 Commits

Author SHA1 Message Date
bors
483fb8fb60 Auto merge of #30009 - apasel422:tests, r=alexcrichton
Closes #25810.
Closes #29276.

r? @alexcrichton
2015-11-24 21:36:54 +00:00
Matthias Bussonnier
5aa45071db Add cargo instructions for dinning_philosopher project
At this point of the book, reader have likely use `cargo new --bin`,
likely 2 times, once if they are lazy. This remind them of the `cargo`
syntax.

I was myself unsure whether it was `cargo create`, `cargo new`, and
whether it would initialize in current working directory or needed a
target.
2015-11-24 21:58:18 +01:00
bors
2a0ce4a629 Auto merge of #29960 - aturon:dismantle-traitref-subtyping, r=nikomatsakis
Trait references are always invariant, so all uses of subtyping between
them are equivalent to using equality.

Moreover, the overlap check was previously performed twice per impl
pair, once in each direction. It is now performed only once, and
internally uses the equality check.

On glium, a crate that spends some time in coherence, this change sped
up coherence checking by a few percent (not very significant).

r? @nikomatsakis
2015-11-24 19:46:59 +00:00
Brian Anderson
1b7b2fe36b Remove RUST_PATH from compiler
This was to support rustpkg but is unused now.
2015-11-24 19:37:40 +00:00
Steve Klabnik
10c6737ecf Fix up docs for char
Part of https://github.com/rust-lang/rust/issues/29333
2015-11-24 13:25:55 -05:00
bors
1004860dd4 Auto merge of #30028 - steveklabnik:rollup, r=steveklabnik
- Successful merges: #29397, #29933, #30004, #30019, #30020, #30023
- Failed merges:
2015-11-24 17:10:55 +00:00
Jonas Schievink
5cb5d20bf9 Fix test failures 2015-11-24 17:46:10 +01:00
Jonas Schievink
52d3de7a7e Remove "this" 2015-11-24 16:34:48 +01:00
Steve Klabnik
204fe21e5b Rollup merge of #30023 - Ms2ger:EntryOrExit, r=Manishearth 2015-11-24 09:43:47 -05:00
Steve Klabnik
fab9dd6c80 Rollup merge of #30020 - Manishearth:unit, r=bluss
`unit` was in code formatting, which is wrong, since it's not actual code. The correct code is `()`.
2015-11-24 09:43:46 -05:00
Steve Klabnik
acda78a663 Rollup merge of #30019 - alex:patch-1, r=steveklabnik
looks like a case of mixed tabs and spaces
2015-11-24 09:43:46 -05:00
Steve Klabnik
731ff93a76 Rollup merge of #30004 - michaelwoerister:primitive-ty-to-str, r=alexcrichton
Good candidate for a rollup, this one.
2015-11-24 09:43:46 -05:00
Steve Klabnik
ff8859880b Rollup merge of #29933 - tbu-:pr_dont_opt_in_copy, r=nikomatsakis
It was introduced with the change that made copy opt-in. The
implementation gives a warning, because the struct contains a raw
pointer.
2015-11-24 09:43:46 -05:00
Steve Klabnik
d0ca581016 Rollup merge of #29397 - dylanmckay:llvmdeps-deps, r=brson
Previously the file was not regenrated upon modification of `src/rustllvm` or others.

Now it will be rebuilt if `src/llvm` or `src/rustllvm` is touched.

Also added *.rs rule to 'clean' rule so that it is removed upon 'make
clean'.

Fixes #28614.
2015-11-24 09:43:46 -05:00
bors
ebb560a069 Auto merge of #29934 - arielb1:constrained-projection-2, r=nikomatsakis
Fixes #29861 - it was a bug I accidentally introduced in #26275.

r? @nikomatsakis
2015-11-24 14:30:46 +00:00
Ms2ger
0eebc0cc04 Use the EntryOrExit variants qualified. 2015-11-24 13:06:12 +01:00
bors
9cf0e3c752 Auto merge of #30012 - jonas-schievink:log-level-trace, r=alexcrichton
The `log` crate on crates.io already knows `TRACE`, but the internal liblog doesn't, which causes it to spew errors when a `TRACE` level is defined. I made `TRACE` behave like `DEBUG`.
2015-11-24 11:10:22 +00:00
bors
561d0884e5 Auto merge of #30000 - Manishearth:unreachable-call, r=nrc
Fixes #1889
2015-11-24 06:58:25 +00:00
Manish Goregaokar
c3600114cc Update reference.md 2015-11-24 11:56:27 +05:30
Alex Gaynor
563adbbea5 fixed inconsistent indentation in book example
looks like a case of mixed tabs and spaces
2015-11-24 01:24:27 -05:00
Manish Goregaokar
7fbcb51589 Fix unreachable code in libsyntax 2015-11-24 10:05:51 +05:30
bors
92f96b2445 Auto merge of #30006 - ntrepid8:skip-check-for-DYLD-libs-in-child-proc, r=alexcrichton
It seems that OS X El Capitan does not pass DYLD_* environment variables to child processes anymore.  See this link: https://forums.developer.apple.com/thread/9233

The causes a test in `src/libstd/process.rs' to fail when those environment variables are not found in the child process.  This PR skips those variables similar to how the Windows envars that start with `=` are skipped.
2015-11-24 04:26:47 +00:00
Nick Cameron
5fb6531903 rustfmt: libflate, libfmt_macros, libgetopts, libgraphviz, liblog, librand 2015-11-24 15:11:41 +13:00
bors
77c995b96a Auto merge of #30001 - Detegr:master, r=Manishearth
r? @Manishearth
2015-11-24 01:42:31 +00:00
Alex Crichton
27ee3fea7a std: Tweak tests of std::time
Typical algebra currently doesn't work on the types in std::time currently (see
[this comment][comment]), so tweak the tests to account for this property.

[comment]: https://github.com/rust-lang/rust/issues/29866#issuecomment-159093809

Closes #29970
2015-11-23 15:27:07 -08:00
Nick Cameron
0dfd875b6e rustfmt libcollections 2015-11-24 11:53:47 +13:00
bors
a9d15a6e92 Auto merge of #29955 - bltavares:makefile-29554, r=brson
Reference #29554
2015-11-23 22:53:14 +00:00
Nick Cameron
1f1a1e6595 rustfmt: liballoc, liballoc_*, libarena 2015-11-24 11:23:17 +13:00
Jonas Schievink
3f36ce8238 Add TRACE to the known log levels
The `log` crate on crates.io already knows TRACE, but the internal
liblog doesn't, which causes it to spew errors when a TRACE level is
defined.
2015-11-23 22:09:40 +01:00
Manish Goregaokar
2eca64de71 Make unreachable_code lint warn on diverging call arguments as well
Fixes #1889
2015-11-24 01:45:21 +05:30
bors
040a77f772 Auto merge of #29952 - petrochenkov:depr, r=brson
Part of https://github.com/rust-lang/rust/issues/29935

The deprecation lint is still called "deprecated", so people can continue using `#[allow(deprecated)]` and similar things.
2015-11-23 20:08:49 +00:00
Jonas Schievink
d4a0e545e7 Print the macro context name on incomplete parse
Fixes #22425

Also fixes #30007, since it's just a change from `true` to `false`.
2015-11-23 21:06:51 +01:00
Andrew Paseltiner
c132736002 Add tests for #25810 and #29276
Closes #25810.
Closes #29276.
2015-11-23 14:57:28 -05:00
Josh Austin
c2f0442a2a skip check for DYLD envars in child proc 2015-11-23 14:08:52 -05:00
Antti Keränen
210c435752 Add compile-fail test for issue #10969 2015-11-23 21:06:08 +02:00
bors
8e9a97529d Auto merge of #29530 - jseyfried:resolve, r=nikomatsakis
Replace `TypeNsDef` and `ValueNsDef` with a more general type `NsDef`.

Define a newtype `NameBinding` for `Rc<RefCell<Option<NsDef>>>` and refactor `NameBindings` to be a `NameBinding` for each namespace.

Replace uses of `NameBindings` with `NameBinding` where only one binding is being used (in `NamespaceResult`, `Target,` etc).

Refactor away `resolve_definition_of_name_in_module` and `NameDefinition`, fixing issue #4952.
2015-11-23 17:31:19 +00:00
Michael Woerister
3be1d8ca7d Avoid some code duplication around getting names of numeric types. 2015-11-23 15:59:36 +01:00
Antti Keränen
428e790d8c Add a note when trying to call a non-function
The note added tells the definition location of the non-function
that is being called. Fixes #10969
2015-11-23 16:57:09 +02:00
bors
69b8e74c31 Auto merge of #29998 - fiveop:patch-1, r=steveklabnik 2015-11-23 14:37:35 +00:00
Philipp Matthias Schäfer
e4e03bc74a wording: results don't fail 2015-11-23 09:39:58 +01:00
bors
4891c00634 Auto merge of #29984 - Manishearth:slice-assert, r=alexcrichton
I'd like to have the message print out the index and length values like it does elsewhere, but I'm not sure how to do that without affecting perf here. Will `assert!(cond, "index out of bounds got {} but len is ", idx, len)` make things slower? It calls `panic_fmt` which is marked as cold but also calls `format_args!`, and I don't know if that allocates or does any heavy lifting.

cc @alexcrichton @Gankro
2015-11-23 06:27:49 +00:00
Manish Goregaokar
5c873be9c3 Improve slice indexing assertion 2015-11-23 09:39:46 +05:30
Manish Goregaokar
c0f9a39e5c Mark slice_error_fail as a cold path 2015-11-23 09:34:58 +05:30
bors
2ba44607fe Auto merge of #28907 - SingingTree:rustfmt_libterm, r=nrc
Hey hey,

This is the result of running rustfmt over the libterm module. The first commit reflects the unaltered changes from rustfmt, and the commit message contains some notes on areas where I thought rustfmt had behaved strangely. The second commit attempts to fix the strange areas from the first commit.

Clarification edit: there are still some areas where I think rustfmt has made changes which may merit discussion (one is noted in the comments below). My second commit only undoes the changes that I figured would not warrant discussion (based on my opinion of the style, which is of course subjective).

r? @nrc
2015-11-22 23:01:56 +00:00
bors
a2847a9999 Auto merge of #29964 - alexcrichton:update-libc, r=brson
Includes rust-lang-nursery/libc#66 which should:

Closes #29818
Closes #29956
2015-11-22 21:17:57 +00:00
Alex Crichton
911cdbc519 libc: Update to master
Includes rust-lang-nursery/libc#66 which should:

Closes #29956
2015-11-22 11:29:12 -08:00
bors
d125ddd52f Auto merge of #29983 - tbu-:pr_env_windows_hidden_variables, r=alexcrichton
Fixes #29972.
2015-11-22 18:34:13 +00:00
Tobias Bucher
dd162d77d4 test_inherit_env: Don't look for hidden environment variables on Windows
Fixes #29972.
2015-11-22 11:12:49 +00:00
bors
e24fffef8a Auto merge of #29716 - Manishearth:repr-error, r=Gankro
r? @Gankro
2015-11-22 08:43:22 +00:00
bors
f04653250b Auto merge of #29980 - Manishearth:missing-diag, r=eddyb
None
2015-11-22 06:42:56 +00:00