mirror of
https://github.com/rust-lang/cargo
synced 2024-10-14 03:32:39 +00:00
Auto merge of #11287 - Rageking8:fix-dupe-word-typos, r=weihanglo
Fix dupe word typos
This commit is contained in:
commit
1945b44853
|
@ -636,7 +636,7 @@ pub fn create_dir_all_excluded_from_backups_atomic(p: impl AsRef<Path>) -> Resul
|
|||
// it from backups, then rename it to the desired name. If we created the
|
||||
// directory directly where it should be and then excluded it from backups
|
||||
// we would risk a situation where cargo is interrupted right after the directory
|
||||
// creation but before the exclusion the the directory would remain non-excluded from
|
||||
// creation but before the exclusion the directory would remain non-excluded from
|
||||
// backups because we only perform exclusion right after we created the directory
|
||||
// ourselves.
|
||||
//
|
||||
|
@ -651,7 +651,7 @@ pub fn create_dir_all_excluded_from_backups_atomic(p: impl AsRef<Path>) -> Resul
|
|||
// the directory being created concurrently by another thread or process as success,
|
||||
// hence the check below to follow the existing behavior. If we get an error at
|
||||
// rename() and suddently the directory (which didn't exist a moment earlier) exists
|
||||
// we can infer from it it's another cargo process doing work.
|
||||
// we can infer from it's another cargo process doing work.
|
||||
if let Err(e) = fs::rename(tempdir.path(), path) {
|
||||
if !path.exists() {
|
||||
return Err(anyhow::Error::from(e));
|
||||
|
|
|
@ -1493,7 +1493,7 @@ fn build_script_local_fingerprints(
|
|||
// figure out a better scheme where a package fingerprint
|
||||
// may be a string (like for a registry) or a list of files
|
||||
// (like for a path dependency). Those list of files would
|
||||
// be stored here rather than the the mtime of them.
|
||||
// be stored here rather than the mtime of them.
|
||||
Some(f) => {
|
||||
let s = f()?;
|
||||
debug!(
|
||||
|
|
|
@ -1436,7 +1436,7 @@ fn on_stderr_line_inner(
|
|||
let rendered = if options.color {
|
||||
msg.rendered
|
||||
} else {
|
||||
// Strip only fails if the the Writer fails, which is Cursor
|
||||
// Strip only fails if the Writer fails, which is Cursor
|
||||
// on a Vec, which should never fail.
|
||||
strip_ansi_escapes::strip(&msg.rendered)
|
||||
.map(|v| String::from_utf8(v).expect("utf8"))
|
||||
|
|
|
@ -272,7 +272,7 @@ impl<'cfg> Timings<'cfg> {
|
|||
Some(state) => state,
|
||||
None => return,
|
||||
};
|
||||
// Don't take samples too too frequently, even if requested.
|
||||
// Don't take samples too frequently, even if requested.
|
||||
let now = Instant::now();
|
||||
if self.last_cpu_recording.elapsed() < Duration::from_millis(100) {
|
||||
return;
|
||||
|
|
|
@ -67,7 +67,7 @@ pub struct ResolvedFeatures {
|
|||
/// Options for how the feature resolver works.
|
||||
#[derive(Default)]
|
||||
pub struct FeatureOpts {
|
||||
/// Build deps and proc-macros will not share share features with other dep kinds,
|
||||
/// Build deps and proc-macros will not share features with other dep kinds,
|
||||
/// and so won't artifact targets.
|
||||
/// In other terms, if true, features associated with certain kinds of dependencies
|
||||
/// will only be unified together.
|
||||
|
|
|
@ -416,7 +416,7 @@ fn activate_deps_loop(
|
|||
// global cache which lists sets of packages where, when
|
||||
// activated, the dependency is unresolvable.
|
||||
//
|
||||
// If any our our frame's dependencies fit in that bucket,
|
||||
// If any our frame's dependencies fit in that bucket,
|
||||
// aka known unresolvable, then we extend our own set of
|
||||
// conflicting activations with theirs. We can do this
|
||||
// because the set of conflicts we found implies the
|
||||
|
|
|
@ -808,7 +808,7 @@ pub fn fetch(
|
|||
|
||||
// We reuse repositories quite a lot, so before we go through and update the
|
||||
// repo check to see if it's a little too old and could benefit from a gc.
|
||||
// In theory this shouldn't be too too expensive compared to the network
|
||||
// In theory this shouldn't be too expensive compared to the network
|
||||
// request we're about to issue.
|
||||
maybe_gc_repo(repo)?;
|
||||
|
||||
|
|
|
@ -139,7 +139,7 @@ Only one of these values may be set, remove one or the other to proceed.
|
|||
/// * Create a simple `foo` project to run the test against.
|
||||
/// * Configure the credential-process config.
|
||||
///
|
||||
/// Returns returns the simple `foo` project to test against and the API server handle.
|
||||
/// Returns the simple `foo` project to test against and the API server handle.
|
||||
fn get_token_test() -> (Project, TestRegistry) {
|
||||
// API server that checks that the token is included correctly.
|
||||
let server = registry::RegistryBuilder::new()
|
||||
|
|
|
@ -482,7 +482,7 @@ fn verify_lto(output: &Output, krate: &str, krate_info: &str, expected_lto: Lto)
|
|||
fn cdylib_and_rlib() {
|
||||
let p = project_with_dep("'cdylib', 'rlib'");
|
||||
let output = p.cargo("build --release -v").exec_with_output().unwrap();
|
||||
// `registry` is ObjectAndBitcode because because it needs Object for the
|
||||
// `registry` is ObjectAndBitcode because it needs Object for the
|
||||
// rlib, and Bitcode for the cdylib (which doesn't support LTO).
|
||||
verify_lto(
|
||||
&output,
|
||||
|
|
Loading…
Reference in a new issue