diff options
| author | bors <bors@rust-lang.org> | 2016-12-20 22:21:53 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-12-20 22:21:53 +0000 |
| commit | 164619a8cfe6d376d25bd3a6a9a5f2856c8de64d (patch) | |
| tree | d8e0dfb4fc85d0b7e5d1ce431f46d5494845d163 /src/libsyntax/std_inject.rs | |
| parent | 3038f30f96fe366e910f9a02521c5a06e5cdc653 (diff) | |
| parent | d5f1c6e67cea5e50de2def2f171f5cf7424ea054 (diff) | |
| download | rust-164619a8cfe6d376d25bd3a6a9a5f2856c8de64d.tar.gz rust-164619a8cfe6d376d25bd3a6a9a5f2856c8de64d.zip | |
Auto merge of #38499 - alexcrichton:rollup, r=alexcrichton
Rollup of 29 pull requests - Successful merges: #37761, #38006, #38131, #38150, #38158, #38171, #38208, #38215, #38236, #38245, #38289, #38302, #38315, #38346, #38388, #38395, #38398, #38418, #38432, #38451, #38463, #38468, #38470, #38471, #38472, #38478, #38486, #38493, #38498 - Failed merges: #38271, #38483
Diffstat (limited to 'src/libsyntax/std_inject.rs')
| -rw-r--r-- | src/libsyntax/std_inject.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libsyntax/std_inject.rs b/src/libsyntax/std_inject.rs index 6a291ad9c40..4ad760a3caf 100644 --- a/src/libsyntax/std_inject.rs +++ b/src/libsyntax/std_inject.rs @@ -81,9 +81,8 @@ pub fn maybe_inject_crates_ref(sess: &ParseSess, vis: ast::Visibility::Inherited, node: ast::ItemKind::Use(P(codemap::dummy_spanned(ast::ViewPathGlob(ast::Path { global: false, - segments: vec![name, "prelude", "v1"].into_iter().map(|name| ast::PathSegment { - identifier: ast::Ident::from_str(name), - parameters: ast::PathParameters::none(), + segments: vec![name, "prelude", "v1"].into_iter().map(|name| { + ast::Ident::from_str(name).into() }).collect(), span: span, })))), |