Skip to content

Commit 647d295

Browse files
committed
review comments
1 parent a3bf27b commit 647d295

File tree

1 file changed

+7
-11
lines changed

1 file changed

+7
-11
lines changed

src/libsyntax/parse/parser.rs

+7-11
Original file line numberDiff line numberDiff line change
@@ -6508,11 +6508,10 @@ impl<'a> Parser<'a> {
65086508
})
65096509
}
65106510

6511-
fn parse_crate_name_with_dashes(
6512-
&mut self,
6513-
error_msg: &str,
6514-
suggestion_msg: &str,
6515-
) -> PResult<'a, ast::Ident> {
6511+
fn parse_crate_name_with_dashes(&mut self) -> PResult<'a, ast::Ident> {
6512+
let error_msg = "crate name using dashes are not valid in `extern crate` statements";
6513+
let suggestion_msg = "if the original crate name uses dashes you need to use underscores \
6514+
in the code";
65166515
let mut ident = self.parse_ident()?;
65176516
let mut idents = vec![];
65186517
let mut replacement = vec![];
@@ -6554,14 +6553,11 @@ impl<'a> Parser<'a> {
65546553
attrs: Vec<Attribute>)
65556554
-> PResult<'a, P<Item>> {
65566555
// Accept `extern crate name-like-this` for better diagnostics
6557-
let ident = self.parse_crate_name_with_dashes(
6558-
"crate name using dashes are not valid in `extern crate` statements",
6559-
"if the original crate name uses dashes you need to use underscores in the code",
6560-
)?;
6556+
let orig_name = self.parse_crate_name_with_dashes()?;
65616557
let (item_name, orig_name) = if let Some(rename) = self.parse_rename()? {
6562-
(rename, Some(ident.name))
6558+
(rename, Some(orig_name.name))
65636559
} else {
6564-
(ident, None)
6560+
(orig_name, None)
65656561
};
65666562
self.expect(&token::Semi)?;
65676563

0 commit comments

Comments
 (0)