diff options
| author | bors <bors@rust-lang.org> | 2019-03-09 18:22:05 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-03-09 18:22:05 +0000 |
| commit | 26b4cb48484382032522384318e70ceb0fbc4a41 (patch) | |
| tree | 085b13b699ff67ecb9fb36598d652bb1f3f770ff /src/libsyntax/parse | |
| parent | e1b8898cfb0392f534cc25808a7f6caad36ebbb7 (diff) | |
| parent | 4eb762a0eada2d2789f9db6eabfe538e9b8ee41d (diff) | |
| download | rust-26b4cb48484382032522384318e70ceb0fbc4a41.tar.gz rust-26b4cb48484382032522384318e70ceb0fbc4a41.zip | |
Auto merge of #59050 - Centril:rollup, r=Centril
Rollup of 13 pull requests Successful merges: - #58518 (Use early unwraps instead of bubbling up errors just to unwrap in the end) - #58626 (rustdoc: add option to calculate "documentation coverage") - #58629 (rust-lldb: fix crash when printing empty string) - #58660 (MaybeUninit: add read_initialized, add examples) - #58670 (fixes rust-lang#52482) - #58676 (look for python2 symlinks before bootstrap python) - #58679 (Refactor passes and pass execution to be more parallel) - #58750 (Make `Unique::as_ptr`, `NonNull::dangling` and `NonNull::cast` const) - #58762 (Mention `unwind(aborts)` in diagnostics for `#[unwind]`) - #58924 (Add as_slice() to slice::IterMut and vec::Drain) - #58990 (Actually publish miri in the manifest) - #59018 (std: Delete a by-definition spuriously failing test) - #59045 (Expose new_sub_parser_from_file) Failed merges: r? @ghost
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs index 98b5fe563b8..371e8fe5cf6 100644 --- a/src/libsyntax/parse/mod.rs +++ b/src/libsyntax/parse/mod.rs @@ -185,7 +185,7 @@ pub fn maybe_new_parser_from_file<'a>(sess: &'a ParseSess, path: &Path) /// Given a session, a crate config, a path, and a span, add /// the file at the given path to the source_map, and return a parser. /// On an error, use the given span as the source of the problem. -crate fn new_sub_parser_from_file<'a>(sess: &'a ParseSess, +pub fn new_sub_parser_from_file<'a>(sess: &'a ParseSess, path: &Path, directory_ownership: DirectoryOwnership, module_name: Option<String>, |