Skip to content

Commit cea2462

Browse files
petrochenkovpetrochenkov
committed
metadata: Remove locator::Context::ident
It's a crate name after renaming, so it's entirely irrelevant to crate loading
1 parent 45d168a commit cea2462

File tree

4 files changed

+24
-29
lines changed

4 files changed

+24
-29
lines changed

‎src/librustc_metadata/creader.rs‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -337,23 +337,21 @@ impl<'a> CrateLoader<'a> {
337337
fn resolve_crate<'b>(
338338
&'b mut self,
339339
root: &'b Option<CratePaths>,
340-
ident: Symbol,
341340
name: Symbol,
342341
hash: Option<&'b Svh>,
343342
extra_filename: Option<&'b str>,
344343
span: Span,
345344
path_kind: PathKind,
346345
mut dep_kind: DepKind,
347346
) -> Result<(CrateNum, Lrc<cstore::CrateMetadata>), LoadError<'b>> {
348-
info!("resolving crate `extern crate {} as {}`", name, ident);
347+
info!("resolving crate `{}`", name);
349348
let result = if let Some(cnum) = self.existing_match(name, hash, path_kind) {
350349
(LoadResult::Previous(cnum), None)
351350
} else {
352351
info!("falling back to a load");
353352
let mut locate_ctxt = locator::Context {
354353
sess: self.sess,
355354
span,
356-
ident,
357355
crate_name: name,
358356
hash,
359357
extra_filename,
@@ -493,25 +491,23 @@ impl<'a> CrateLoader<'a> {
493491
_ => dep.kind,
494492
};
495493
let (local_cnum, ..) = self.resolve_crate(
496-
root, dep.name, dep.name, Some(&dep.hash), Some(&dep.extra_filename), span,
494+
root, dep.name, Some(&dep.hash), Some(&dep.extra_filename), span,
497495
PathKind::Dependency, dep_kind,
498496
).unwrap_or_else(|err| err.report());
499497
local_cnum
500498
})).collect()
501499
}
502500

503-
fn read_extension_crate(&mut self, span: Span, orig_name: Symbol, rename: Symbol)
504-
-> ExtensionCrate {
505-
info!("read extension crate `extern crate {} as {}`", orig_name, rename);
501+
fn read_extension_crate(&mut self, name: Symbol, span: Span) -> ExtensionCrate {
502+
info!("read extension crate `{}`", name);
506503
let target_triple = self.sess.opts.target_triple.clone();
507504
let host_triple = TargetTriple::from_triple(config::host_triple());
508505
let is_cross = target_triple != host_triple;
509506
let mut target_only = false;
510507
let mut locate_ctxt = locator::Context {
511508
sess: self.sess,
512509
span,
513-
ident: orig_name,
514-
crate_name: rename,
510+
crate_name: name,
515511
hash: None,
516512
extra_filename: None,
517513
filesearch: self.sess.host_filesearch(PathKind::Crate),
@@ -606,7 +602,7 @@ impl<'a> CrateLoader<'a> {
606602
span: Span,
607603
name: Symbol)
608604
-> Option<(PathBuf, CrateDisambiguator)> {
609-
let ekrate = self.read_extension_crate(span, name, name);
605+
let ekrate = self.read_extension_crate(name, span);
610606

611607
if ekrate.target_only {
612608
// Need to abort before syntax expansion.
@@ -699,7 +695,7 @@ impl<'a> CrateLoader<'a> {
699695

700696
let dep_kind = DepKind::Implicit;
701697
let (cnum, data) =
702-
self.resolve_crate(&None, name, name, None, None, DUMMY_SP, PathKind::Crate, dep_kind)
698+
self.resolve_crate(&None, name, None, None, DUMMY_SP, PathKind::Crate, dep_kind)
703699
.unwrap_or_else(|err| err.report());
704700

705701
// Sanity check the loaded crate to ensure it is indeed a panic runtime
@@ -807,7 +803,7 @@ impl<'a> CrateLoader<'a> {
807803
let symbol = Symbol::intern(name);
808804
let dep_kind = DepKind::Explicit;
809805
let (_, data) =
810-
self.resolve_crate(&None, symbol, symbol, None, None, DUMMY_SP,
806+
self.resolve_crate(&None, symbol, None, None, DUMMY_SP,
811807
PathKind::Crate, dep_kind)
812808
.unwrap_or_else(|err| err.report());
813809

@@ -831,7 +827,7 @@ impl<'a> CrateLoader<'a> {
831827
let symbol = Symbol::intern("profiler_builtins");
832828
let dep_kind = DepKind::Implicit;
833829
let (_, data) =
834-
self.resolve_crate(&None, symbol, symbol, None, None, DUMMY_SP,
830+
self.resolve_crate(&None, symbol, None, None, DUMMY_SP,
835831
PathKind::Crate, dep_kind)
836832
.unwrap_or_else(|err| err.report());
837833

@@ -1015,7 +1011,7 @@ impl<'a> CrateLoader<'a> {
10151011
};
10161012

10171013
let (cnum, ..) = self.resolve_crate(
1018-
&None, item.ident.name, orig_name, None, None,
1014+
&None, orig_name, None, None,
10191015
item.span, PathKind::Crate, dep_kind,
10201016
).unwrap_or_else(|err| err.report());
10211017

@@ -1044,7 +1040,7 @@ impl<'a> CrateLoader<'a> {
10441040
span: Span,
10451041
) -> CrateNum {
10461042
let cnum = self.resolve_crate(
1047-
&None, name, name, None, None, span, PathKind::Crate, DepKind::Explicit
1043+
&None, name, None, None, span, PathKind::Crate, DepKind::Explicit
10481044
).unwrap_or_else(|err| err.report()).0;
10491045

10501046
self.update_extern_crate(
@@ -1068,7 +1064,7 @@ impl<'a> CrateLoader<'a> {
10681064
span: Span,
10691065
) -> Option<CrateNum> {
10701066
let cnum = self.resolve_crate(
1071-
&None, name, name, None, None, span, PathKind::Crate, DepKind::Explicit
1067+
&None, name, None, None, span, PathKind::Crate, DepKind::Explicit
10721068
).ok()?.0;
10731069

10741070
self.update_extern_crate(

‎src/librustc_metadata/locator.rs‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,6 @@ pub struct CrateMismatch {
254254
pub struct Context<'a> {
255255
pub sess: &'a Session,
256256
pub span: Span,
257-
pub ident: Symbol,
258257
pub crate_name: Symbol,
259258
pub hash: Option<&'a Svh>,
260259
pub extra_filename: Option<&'a str>,
@@ -332,12 +331,12 @@ impl<'a> Context<'a> {
332331
self.span,
333332
E0460,
334333
"found possibly newer version of crate `{}`{}",
335-
self.ident,
334+
self.crate_name,
336335
add);
337336
err.note("perhaps that crate needs to be recompiled?");
338337
let mismatches = self.rejected_via_hash.iter();
339338
for &CrateMismatch { ref path, .. } in mismatches {
340-
msg.push_str(&format!("\ncrate `{}`: {}", self.ident, path.display()));
339+
msg.push_str(&format!("\ncrate `{}`: {}", self.crate_name, path.display()));
341340
}
342341
match self.root {
343342
&None => {}
@@ -355,13 +354,13 @@ impl<'a> Context<'a> {
355354
E0461,
356355
"couldn't find crate `{}` \
357356
with expected target triple {}{}",
358-
self.ident,
357+
self.crate_name,
359358
self.triple,
360359
add);
361360
let mismatches = self.rejected_via_triple.iter();
362361
for &CrateMismatch { ref path, ref got } in mismatches {
363362
msg.push_str(&format!("\ncrate `{}`, target triple {}: {}",
364-
self.ident,
363+
self.crate_name,
365364
got,
366365
path.display()));
367366
}
@@ -372,12 +371,12 @@ impl<'a> Context<'a> {
372371
self.span,
373372
E0462,
374373
"found staticlib `{}` instead of rlib or dylib{}",
375-
self.ident,
374+
self.crate_name,
376375
add);
377376
err.help("please recompile that crate using --crate-type lib");
378377
let mismatches = self.rejected_via_kind.iter();
379378
for &CrateMismatch { ref path, .. } in mismatches {
380-
msg.push_str(&format!("\ncrate `{}`: {}", self.ident, path.display()));
379+
msg.push_str(&format!("\ncrate `{}`: {}", self.crate_name, path.display()));
381380
}
382381
err.note(&msg);
383382
err
@@ -387,14 +386,14 @@ impl<'a> Context<'a> {
387386
E0514,
388387
"found crate `{}` compiled by an incompatible version \
389388
of rustc{}",
390-
self.ident,
389+
self.crate_name,
391390
add);
392391
err.help(&format!("please recompile that crate using this compiler ({})",
393392
rustc_version()));
394393
let mismatches = self.rejected_via_version.iter();
395394
for &CrateMismatch { ref path, ref got } in mismatches {
396395
msg.push_str(&format!("\ncrate `{}` compiled by {}: {}",
397-
self.ident,
396+
self.crate_name,
398397
got,
399398
path.display()));
400399
}
@@ -405,10 +404,10 @@ impl<'a> Context<'a> {
405404
self.span,
406405
E0463,
407406
"can't find crate for `{}`{}",
408-
self.ident,
407+
self.crate_name,
409408
add);
410409

411-
if (self.ident == sym::std || self.ident == sym::core)
410+
if (self.crate_name == sym::std || self.crate_name == sym::core)
412411
&& self.triple != TargetTriple::from_triple(config::host_triple()) {
413412
err.note(&format!("the `{}` target may not be installed", self.triple));
414413
}

‎src/test/ui/use/use-meta-mismatch.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// error-pattern:can't find crate for `extra`
1+
// error-pattern:can't find crate for `fake_crate`
22

33
extern crate fake_crate as extra;
44

‎src/test/ui/use/use-meta-mismatch.stderr‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error[E0463]: can't find crate for `extra`
1+
error[E0463]: can't find crate for `fake_crate`
22
--> $DIR/use-meta-mismatch.rs:3:1
33
|
44
LL | extern crate fake_crate as extra;

0 commit comments

Comments
 (0)