Commit Graph

40772 Commits

Author SHA1 Message Date
bors b49a5ef003 Auto merge of #23857 - phildawes:libsyntax_nopanic, r=nikomatsakis
Hello! 

I've been working towards a libsyntax without panics. See:
http://internals.rust-lang.org/t/changing-libsyntax-to-use-result-instead-of-panic/1670

This patch changes the internals of parser.rs to use Result<> rather than panicing. It keeps the following old-style panicing functions as a facade:
parse_expr, parse_item, parse_pat, parse_arm, parse_ty, parse_stmt

I left these functions because I wasn't sure what to do about the quote_* macros or how many syntax-extensions would break if these and quoting macros returned Result.

The gyst of the rest of the patch is:

 - Functions in parse/parser.rs return PResult<> rather than panicing
 - Other functions in libsyntax call panic! explicitly if they rely on panicing behaviour.
 - I added a macro 'panictry!()' to act as scaffolding for callers while converting panicing functions. (This does the same as 'unwrap()' but is easier to grep for and turn into try!()).

Am I on the right track?  I'd quite like to get something merged soon as keeping this rebased in the face of libsyntax changes is a lot of work. Please let me know what changes you'd like to see to make this happen.

Thanks!, Phil
2015-04-06 22:08:01 +00:00
bors aab8669dda Auto merge of #23655 - gereeter:rustc-remove-ident, r=sanxiyn
...of #6993.

cc @pcwalton
2015-04-06 19:20:39 +00:00
bors 3c07835e10 Auto merge of #24056 - nikomatsakis:issue-23853-crates-io, r=aturon
If we find a blanket impl for `Trait` but we're matching on an object `Trait`, prefer the object (I think we could perhaps go either way, but this seems safer). Also give a nice error for attempts to manually `impl Trait for Trait`, since they will be ineffectual.

This fixes the problems around ambiguity ICEs relating to `Any` and `MarkerTrait` that were cropping up all over the place. There may still be similar ICEs reported in #21756 that this PR does not address.

Fixes #24015.

Fixes #24051.
Fixes #24037.
Fixes #23853.
Fixes #21942.
cc #21756.

cc @alexcrichton (this fixes crates.io)
r? @aturon
2015-04-06 16:07:18 +00:00
bors 9f37ba64e8 Auto merge of #24104 - frewsxcv:patch-12, r=sanxiyn 2015-04-06 12:23:21 +00:00
Niko Matsakis 0d56699d41 If we find a blanket impl for Trait but we're matching on an object
`Trait`, prefer the object. Also give a nice error for attempts to
manually `impl Trait for Trait`, since they will be ineffectual.

Fixes #24015.

Fixes #24051.
Fixes #24037.
Fixes #23853.
Fixes #21942.
cc #21756.
2015-04-06 06:12:51 -04:00
Corey Farwell 19d8b67b7e Remove unnecessary returns in API examples 2015-04-06 00:06:24 -07:00
bors cf51e55274 Auto merge of #24087 - mossberg:docs-comma, r=steveklabnik
Correct mistyped comma, and slightly improve sentence.

r? @steveklabnik
2015-04-06 02:00:21 +00:00
bors be9bd7c93a Auto merge of #24093 - GuillaumeGomez:typo, r=steveklabnik
Fixes #24080.
2015-04-05 22:18:29 +00:00
Guillaume Gomez 24f06e6664 Remove external iterator in CharIndices comment and the reference to the std::iter module 2015-04-05 18:54:07 +02:00
bors de6742bb1c Auto merge of #24053 - kvark:get_mut, r=alexcrichton
As requested by @kballard in #23844
2015-04-05 16:14:11 +00:00
bors 529de5f45b Auto merge of #24084 - mdinger:align_nit, r=steveklabnik
Really minor nitpick but if you're gonna align them, they should be aligned properly.

r? @steveklabnik
2015-04-05 13:29:48 +00:00
bors b3c5507f3a Auto merge of #24071 - github-monoculture:patch-1, r=steveklabnik
doc copy error
r? @steveklabnik
2015-04-05 10:46:38 +00:00
Phil Dawes e3427c3c34 Add comments suggested by Niko 2015-04-05 09:52:56 +01:00
Phil Dawes b2bcb7229a Work towards a non-panicing parser (libsyntax)
- Functions in parser.rs return PResult<> rather than panicing
- Other functions in libsyntax call panic! explicitly for now if they rely on panicing behaviour.
- 'panictry!' macro added as scaffolding while converting panicing functions.
  (This does the same as 'unwrap()' but is easier to grep for and turn into try!())
- Leaves panicing wrappers for the following functions so that the
  quote_* macros behave the same:
  - parse_expr, parse_item, parse_pat, parse_arm, parse_ty, parse_stmt
2015-04-05 09:52:50 +01:00
Mark Mossberg 52aa5d0039 Documentation fix
Correct mistyped comma, and slightly improve sentence.
2015-04-05 02:56:16 -04:00
bors 7155c8d1c0 Auto merge of #23976 - dhuseby:bitrig_fixing_tests, r=alexcrichton
This fixes up the "make check" part of the rust build os that the Bitrig buildbot will succeed.
2015-04-05 06:28:08 +00:00
bors f73f3233f1 Auto merge of #24067 - apasel422:patch-1, r=Gankro
Per [RFC #0505](https://github.com/rust-lang/rfcs/blob/master/text/0505-api-comment-conventions.md#formatting).
2015-04-05 02:47:13 +00:00
mdinger 85f6c9ff84 Alignment nitpick 2015-04-04 20:34:59 -04:00
bors 083b8a4041 Auto merge of #24055 - estsauver:24044, r=alexcrichton
If a result is highlighted, when the search changes that state should no
longer be highlighted. Fixes #24044

cc @steveklabnik
2015-04-05 00:03:21 +00:00
Dzmitry Malyshau bc1aef3e7b Removed explicit lifetimes for get_mut. Fixed the doc test. 2015-04-04 19:01:48 -04:00
Dzmitry Malyshau c1d716ed4b Renamed Arc::try_unique to get_mut 2015-04-04 18:55:29 -04:00
bors 1169693f03 Auto merge of #24016 - aquach:master, r=Manishearth
Ran across this one while learning from the Book.
2015-04-04 21:19:31 +00:00
Dave Huseby 5387189d5b fixing some tests and temporarily disabling others to get Bitrig build working 100% 2015-04-04 12:33:44 -07:00
bors b8a02736be Auto merge of #24045 - frewsxcv:cleanup, r=alexcrichton 2015-04-04 18:35:39 +00:00
github-monoculture 9b455f1799 Update method-syntax.md
doc copy error
r? @steveklabnik
2015-04-04 17:49:16 +00:00
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
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
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
bors bcae782aa8 Auto merge of #23979 - Ryman:error_from_string, r=alexcrichton 2015-04-04 02:45:41 +00:00