Commit Graph

41571 Commits

Author SHA1 Message Date
bors
b3315881f5 Auto merge of #23987 - liammonahan:master, r=Manishearth
I ran across a comma splice.

I didn't set the "note:" off inside parenthesis.  I looked around in other places and saw it both ways, but without surrounding parenthesis seemed to be the more common convention followed elsewhere in the docs.  Let me know if you have an overriding preference about that and I'll change it.

r? @steveklabnik
2015-04-04 15:51:03 +00:00
Andrew Paseltiner
2d198955d3 s/Perform/Performs/
Per [RFC #0505](https://github.com/rust-lang/rfcs/blob/master/text/0505-api-comment-conventions.md#formatting).
2015-04-04 10:26:14 -04:00
bors
04e0125a58 Auto merge of #23981 - chastell:book_crates-and-modules_io_sync, r=Manishearth
This syncs the _Crates and Modules_ chapter of the book with current output:

* the runs are supposed to be in the project’s directory,
* `rustc` has slightly different error messages (and things like macro line:col numbers),
* Cargo now compiles things into `target/debug`.
2015-04-04 13:07:34 +00:00
Niko Matsakis
48a023c2e9 Convert lifetime shadowing into a hard error, as promised. 2015-04-04 05:55:24 -04:00
Earl St Sauver
1b1d910cd7 Make changing doc search unhighlight current result
If a result is highlighted, when the search changes that state should no
longer be highlighted. Fixes #24044

cc @steveklabnik
2015-04-04 15:21:18 +07:00
Felix S. Klock II
c4216a50bd Test cases for Issue 23338.
We ignore pretty for the params-outlive-temps-of-body test because the
way its comments are formatted exercises a known bug in the pretty
printer.
2015-04-04 09:24:29 +02:00
Felix S. Klock II
05b8a106e4 Encode more precise scoping rules for function params.
Function params which outlive everything in the body (incl
temporaries).  Thus if we assign them their own `CodeExtent`, the
region inference can properly show that it is sound to have
temporaries with destructors that reference the parameters (because
such temporaries will be dropped before the parameters are).

This allows us to address issue 23338 in a clean way.

As a drive-by, fix a mistake in the tyencode for
`CodeExtent::BlockRemainder`.
2015-04-04 09:23:40 +02:00
bors
6971727d45 Auto merge of #24009 - Manishearth:rollup, r=Manishearth 2015-04-04 07:20:04 +00:00
Manish Goregaokar
b62c11023c Fix doc (fixup #24031) 2015-04-04 12:50:43 +05:30
Manish Goregaokar
29582d39bd Rollup merge of #24040 - hackaugusto:patch-1, r=steveklabnik 2015-04-04 10:58:07 +05:30
Manish Goregaokar
61e0aafa3d Rollup merge of #24039 - frewsxcv:patch-10, r=steveklabnik 2015-04-04 10:57:48 +05:30
Manish Goregaokar
563cf10d37 Rollup merge of #24038 - frewsxcv:patch-9, r=steveklabnik 2015-04-04 10:57:26 +05:30
Manish Goregaokar
a20aff3185 Rollup merge of #24032 - steveklabnik:beta_install, r=alexcrichton
Default is now beta, add nightly in the unstable section
2015-04-04 10:56:56 +05:30
Manish Goregaokar
91d1e8d275 Rollup merge of #24031 - callahad:trpl_old_io_removal, r=steveklabnik
Also: the std_misc feature flag is removed; it's not needed in Beta.

Hat tip to @tshepang in #23871

Fixes #24023

This PR replaces #24024
2015-04-04 10:56:40 +05:30
Manish Goregaokar
fb4e0a9ee6 Rollup merge of #24022 - steveklabnik:hn_fix, r=nikomatsakis
from https://news.ycombinator.com/item?id=9317822
2015-04-04 10:56:23 +05:30
Manish Goregaokar
0daa005826 Rollup merge of #24012 - tsion:patch-1, r=steveklabnik
This was brought up in IRC by a confused reader.

r? steveklabnik
2015-04-04 10:56:06 +05:30
Manish Goregaokar
9ebb53ea5f Rollup merge of #23997 - richo:typos, r=huonw
Kinda hoped I'd spot something else for this PR, but then didn't.
2015-04-04 10:55:44 +05:30
Manish Goregaokar
d83f49b436 Rollup merge of #23996 - frewsxcv:patch-8, r=alexcrichton 2015-04-04 10:55:30 +05:30
Manish Goregaokar
8ac622ce72 Rollup merge of #23993 - aturon:beta-update-authors, r=alexcrichton
r? @alexcrichton @brson
2015-04-04 10:55:13 +05:30
Manish Goregaokar
3058eede7b Rollup merge of #23990 - dhuseby:bitrig_fixing_jemalloc_config, r=alexcrichton
Until I can figure out the correct way to configure jemalloc for Bitrig, this patch will correctly disable it.  All other build targets remain unchanged.
2015-04-04 10:54:58 +05:30
Manish Goregaokar
17e83e31be Rollup merge of #23978 - brson:installer, r=alexcrichton
Won't make it for beta, but it's rust-packaging that matters.

r? @alexcrichton
2015-04-04 10:54:40 +05:30
Manish Goregaokar
9fc7a1e860 Rollup merge of #23941 - carloslfu:patch-1, r=steveklabnik
Validate if the description is available in the rawSearchIndex
2015-04-04 10:54:24 +05:30
Manish Goregaokar
90b9b0df07 Rollup merge of #24033 - petrochenkov:pattest, r=alexcrichton
This was supposed to be a part of #23930
2015-04-04 10:54:10 +05:30
Manish Goregaokar
3cdbeca6bc Rollup merge of #24005 - ranma42:macosx-no-javac-popup, r=alexcrichton
MacOS X does not ship with Java installed by default. Instead it
includes binary stubs that upon execution pop up a message suggesting
the installation of the JDK.

Since `javac` is only used when `antlr4` is available, it is possible
to work around the popup by only probing for `javac` if `antlr4` has
been successfully detected (in which case the JDK is probably already
installed on the system).

Fixes #23138.
2015-04-04 10:53:52 +05:30
Manish Goregaokar
cf2773e327 Rollup merge of #23995 - aturon:cow-as-ref, r=huonw
The existing impl had the too-strong requirement of `Clone`, when only
`ToOwned` was needed.
2015-04-04 10:53:37 +05:30
Manish Goregaokar
d0c32834f4 Rollup merge of #23979 - Ryman:error_from_string, r=alexcrichton 2015-04-04 10:53:22 +05:30
Corey Farwell
263fdfeea8 Cleanup and modernize some things in libcore::iter 2015-04-03 21:38:51 -07:00
Dan Callahan
cb1e6a2dc4 book: use mod test consistently
Fixes #24030

Of the four code samples with modules in TRPL:

    - 2 use `mod test`
    - 2 use `mod tests`

We should be consistent here, but which is right? The stdlib is split:

    $ grep -r 'mod tests {' src/lib* | wc -l
          63
    $ grep -r 'mod test {'  src/lib* | wc -l
          58

Subjectively, I like the plural, but both the language reference and the
style guide recommend the singular. So we'll go with that here, for now.
2015-04-03 22:48:00 -05:00
bors
bcae782aa8 Auto merge of #23979 - Ryman:error_from_string, r=alexcrichton 2015-04-04 02:45:41 +00:00
Augusto Hack
eb2a6d9866 Removed repeated sentence. 2015-04-03 22:56:34 -03:00
Corey Farwell
6ff085c9a9 Make example function in comment more idiomatic 2015-04-03 18:32:29 -07:00
Corey Farwell
692c88c9bc Simplify match branches in documentation comment 2015-04-03 18:09:11 -07:00
Steve Klabnik
925a52cb93 Update Rust install instructions in TRPL
Default is now beta, add nightly in the unstable section
2015-04-03 19:09:41 -04:00
Jonathan S
3cbc345cf7 In librustc*, convert many uses of ast::Ident to ast::Name, fixing much of #6993. 2015-04-03 17:46:08 -05:00
bors
f207ecbe02 Auto merge of #23972 - gkoz:partial_eq_str_string, r=alexcrichton
Right now comparing a `&String` (or a `&Cow`) to a `&str` requires redundant borrowing of the latter. Implementing `PartialEq<str>` tries to avoid this limitation.

```rust
struct Foo (String);

fn main () {
    let s = Foo("foo".to_string());
    match s {
        Foo(ref x) if x == &"foo" => println!("foo!"),
        // avoid this -----^
        _ => {}
    }
}
```

I was hoping that #23521 would solve this but it didn't work out.
2015-04-03 22:37:07 +00:00
Dan Callahan
3b73a6e3ce Remove old_io from trpl/concurrency.md
Also: the std_misc feature flag is removed; it's not needed in Beta.

Hat tip to @tshepang in #23871

Fixes #24023
2015-04-03 17:33:12 -05:00
Simonas Kazlauskas
000db3841e Rebase fallout 2015-04-04 00:21:58 +03:00
Alex Quach
c3b27be942 Delete duplicated sentence. 2015-04-03 12:56:28 -07:00
bors
c1b8eb5ad4 Auto merge of #24018 - nikomatsakis:marker-trait-stability, r=alexcrichton
r? @alexcrichton
2015-04-03 19:53:27 +00:00
Steve Klabnik
862e16025a Don't speak of old_io
from https://news.ycombinator.com/item?id=9317822
2015-04-03 15:24:47 -04:00
Niko Matsakis
62b3060507 Revert accidental change from stable -> unstable; just meant to
deprecate (though these will likely be purged for 1.0).
2015-04-03 14:30:13 -04:00
Alex Quach
c5df38efa3 Fixing copy/paste typo. 2015-04-03 11:17:15 -07:00
Scott Olson
2f63e9c127 Remove unnecessary Vec<_> annotation from docs
This was brought up in IRC by a confused reader.
2015-04-03 13:23:58 -04:00
Dave Huseby
787c6cda00 this correctly disables jemalloc on Bitrig 2015-04-03 08:54:08 -07:00
bors
80def6c244 Auto merge of #23930 - petrochenkov:issue23656, r=nrc
Fixes #22757
Fixes #22972
Fixes #23044
Fixes #23151
Fixes #23597
Fixes #23656
Fixes #23929
It also fixes some other corner cases in range patterns, like incorrect spans or not accepting global paths after `...`.

It passes `make check` but needs some additional tests (then it will fix #22546 as well), I'll write them today or tomorrow.
2015-04-03 15:44:24 +00:00
Andrea Canciani
0621a83ba5 Workaround javac popup on MacOS X
MacOS X does not ship with Java installed by default. Instead it
includes binary stubs that upon execution pop up a message suggesting
the installation of the JDK.

Since `javac` is only used when `antlr4` is available, it is possible
to work around the popup by only probing for `javac` if `antlr4` has
been successfully detected (in which case the JDK is probably already
installed on the system).

Fixes #23138.
2015-04-03 15:10:59 +02:00
bors
2615106a46 Auto merge of #23938 - nikomatsakis:invariant, r=pnkfelix
There are still some remnants we could remove from the compiler (e.g. references to "subtraitrefs"; traits still have variance entries in the variance table), but this removes all user-visible bits I believe.

r? @pnkfelix 

Fixes #22806 (since such traits would no longer exist)
2015-04-03 12:59:11 +00:00
Simonas Kazlauskas
ea04cdfbe8 Remove two cases of unecesary match branches 2015-04-03 15:48:07 +03:00
Simonas Kazlauskas
d8d59a954f Address Alex’s comments 2015-04-03 15:48:07 +03:00
Simonas Kazlauskas
8943709221 Update tests to match the messages 2015-04-03 15:48:07 +03:00