Auto merge of #6065 - zachlute:change-project-to-package, r=dwijnand

Replace 'project' with 'package' in many strings and comments.

Partial fix for #6056.

Shouldn't be anything too interesting or surprising in here.

Still need to do documentation, but will do that as a different PR.

Author: bors

src/bin/cargo/cli.rs

@@ -178,18 +178,18 @@ OPTIONS:
 {unified}
 
 Some common cargo commands are (see all commands with --list):
-    build       Compile the current project
-    check       Analyze the current project and report errors, but don't build object files
+    build       Compile the current package
+    check       Analyze the current package and report errors, but don't build object files
     clean       Remove the target directory
-    doc         Build this project's and its dependencies' documentation
-    new         Create a new cargo project
-    init        Create a new cargo project in an existing directory
+    doc         Build this package's and its dependencies' documentation
+    new         Create a new cargo package
+    init        Create a new cargo package in an existing directory
     run         Build and execute src/main.rs
     test        Run the tests
     bench       Run the benchmarks
     update      Update dependencies listed in Cargo.lock
     search      Search registry for crates
-    publish     Package and upload this project to the registry
+    publish     Package and upload this package to the registry
     install     Install a Rust binary
     uninstall   Uninstall a Rust binary
 

src/bin/cargo/commands/generate_lockfile.rs

@@ -4,7 +4,7 @@ use cargo::ops;
 
 pub fn cli() -> App {
     subcommand("generate-lockfile")
-        .about("Generate the lockfile for a project")
+        .about("Generate the lockfile for a package")
         .arg_manifest_path()
 }
 

src/bin/cargo/commands/init.rs

@@ -14,6 +14,6 @@ pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
     ops::init(&opts, config)?;
     config
         .shell()
-        .status("Created", format!("{} project", opts.kind))?;
+        .status("Created", format!("{} package", opts.kind))?;
     Ok(())
 }

src/bin/cargo/commands/locate_project.rs

@@ -19,7 +19,7 @@ pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
     let root = root.to_str()
         .ok_or_else(|| {
             format_err!(
-                "your project path contains characters \
+                "your package path contains characters \
                  not representable in Unicode"
             )
         })

src/bin/cargo/commands/metadata.rs

@@ -6,7 +6,7 @@ use cargo::print_json;
 pub fn cli() -> App {
     subcommand("metadata")
         .about(
-            "Output the resolved dependencies of a project, \
+            "Output the resolved dependencies of a package, \
              the concrete used versions including overrides, \
              in machine-readable format",
         )

src/bin/cargo/commands/new.rs

@@ -14,13 +14,13 @@ pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
 
     ops::new(&opts, config)?;
     let path = args.value_of("path").unwrap();
-    let project_name = if let Some(name) = args.value_of("name") {
+    let package_name = if let Some(name) = args.value_of("name") {
         name
     } else {
         path
     };
     config
         .shell()
-        .status("Created", format!("{} `{}` project", opts.kind, project_name))?;
+        .status("Created", format!("{} `{}` package", opts.kind, package_name))?;
     Ok(())
 }

src/bin/cargo/commands/run.rs

@@ -23,7 +23,7 @@ pub fn cli() -> App {
         .arg_message_format()
         .after_help(
             "\
-If neither `--bin` nor `--example` are given, then if the project only has one
+If neither `--bin` nor `--example` are given, then if the package only has one
 bin target it will be run. Otherwise `--bin` specifies the bin target to run,
 and `--example` specifies the example target to run. At most one of `--bin` or
 `--example` can be provided.

src/cargo/core/compiler/build_plan.rs

@@ -1,4 +1,4 @@
-//! A graph-like structure used to represent the rustc commands to build the project and the
+//! A graph-like structure used to represent the rustc commands to build the package and the
 //! interdependencies between them.
 //!
 //! The BuildPlan structure is used to store the dependency graph of a dry run so that it can be

src/cargo/core/compiler/context/mod.rs

@@ -31,8 +31,8 @@ use self::compilation_files::CompilationFiles;
 /// All information needed to define a Unit.
 ///
 /// A unit is an object that has enough information so that cargo knows how to build it.
-/// For example, if your project has dependencies, then every dependency will be built as a library
-/// unit. If your project is a library, then it will be built as a library unit as well, or if it
+/// For example, if your package has dependencies, then every dependency will be built as a library
+/// unit. If your package is a library, then it will be built as a library unit as well, or if it
 /// is a binary with `main.rs`, then a binary will be output. There are also separate unit types
 /// for `test`ing and `check`ing, amongst others.
 ///
@@ -462,7 +462,7 @@ impl<'a, 'cfg> Context<'a, 'cfg> {
         //   `CARGO_INCREMENTAL`.
         // * `profile.dev.incremental` - in `Cargo.toml` specific profiles can
         //   be configured to enable/disable incremental compilation. This can
-        //   be primarily used to disable incremental when buggy for a project.
+        //   be primarily used to disable incremental when buggy for a package.
         // * Finally, each profile has a default for whether it will enable
         //   incremental compilation or not. Primarily development profiles
         //   have it enabled by default while release profiles have it disabled

src/cargo/core/compiler/job_queue.rs

@@ -220,7 +220,7 @@ impl<'a> JobQueue<'a> {
         // maximum number of parallel jobs we have tokens for). A local queue
         // is maintained separately from the main dependency queue as one
         // dequeue may actually dequeue quite a bit of work (e.g. 10 binaries
-        // in one project).
+        // in one package).
         //
         // After a job has finished we update our internal state if it was
         // successful and otherwise wait for pending work to finish if it failed