diff options
| author | bors <bors@rust-lang.org> | 2019-10-28 04:21:44 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-10-28 04:21:44 +0000 |
| commit | 9285d401a6070094747465962bc49969b93e14c5 (patch) | |
| tree | 6380d967e96679b26297a1c8a2adc7641f65551e /src/libsyntax/parse/parser | |
| parent | 95f437b3cfb2fec966d7eaf69d7c2e36f9c274d1 (diff) | |
| parent | 606743e8c70821d2aaaf4886d601f1bf96884ce2 (diff) | |
| download | rust-9285d401a6070094747465962bc49969b93e14c5.tar.gz rust-9285d401a6070094747465962bc49969b93e14c5.zip | |
Auto merge of #65885 - Centril:rollup-y6b2qbf, r=Centril
Rollup of 6 pull requests Successful merges: - #64747 (Stabilize `Option::flatten`) - #65664 (`std::panic::Location` is a lang_item, add `core::intrinsics::caller_location` (RFC 2091 3/N)) - #65792 (rustc, rustc_passes: reduce deps on rustc_expand) - #65849 (librustc_lexer: Enhance documentation) - #65873 (doc: explain why it is unsafe to construct Vec<u8> from Vec<u16>) - #65880 (Gather together usefulness tests) Failed merges: r? @ghost
Diffstat (limited to 'src/libsyntax/parse/parser')
| -rw-r--r-- | src/libsyntax/parse/parser/path.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/parse/parser/path.rs b/src/libsyntax/parse/parser/path.rs index 77709a22953..38a28224dab 100644 --- a/src/libsyntax/parse/parser/path.rs +++ b/src/libsyntax/parse/parser/path.rs @@ -130,7 +130,7 @@ impl<'a> Parser<'a> { } /// Parse a list of paths inside `#[derive(path_0, ..., path_n)]`. - crate fn parse_derive_paths(&mut self) -> PResult<'a, Vec<Path>> { + pub fn parse_derive_paths(&mut self) -> PResult<'a, Vec<Path>> { self.expect(&token::OpenDelim(token::Paren))?; let mut list = Vec::new(); while !self.eat(&token::CloseDelim(token::Paren)) { |