mirror of
https://github.com/google/comprehensive-rust.git
synced 2025-03-20 06:21:09 +02:00
c9f66fd425
This is the result of running `dprint fmt` after removing `src/` from
the list of excluded directories.
This also reformats the Rust code: we might want to tweak this a bit in
the future since some of the changes removes the hand-formatting. Of
course, this formatting can be seen as a mis-feature, so maybe this is
good overall.
Thanks to mdbook-i18n-helpers 0.2, the POT file is nearly unchanged
after this, meaning that all existing translations remain valid! A few
messages were changed because of stray whitespace characters:
msgid ""
"Slices always borrow from another object. In this example, `a` has to remain "
-"'alive' (in scope) for at least as long as our slice. "
+"'alive' (in scope) for at least as long as our slice."
msgstr ""
The formatting is enforced in CI and we will have to see how annoying
this is in practice for the many contributors. If it becomes annoying,
we should look into fixing dprint/check#11 so that `dprint` can annotate
the lines that need fixing directly, then I think we can consider more
strict formatting checks.
I added more customization to `rustfmt.toml`. This is to better emulate
the dense style used in the course:
- `max_width = 85` allows lines to take up the full width available in
our code blocks (when taking margins and the line numbers into account).
- `wrap_comments = true` ensures that we don't show very long comments
in the code examples. I edited some comments to shorten them and avoid
unnecessary line breaks — please trim other unnecessarily long comments
when you see them! Remember we're writing code for slides 😄
- `use_small_heuristics = "Max"` allows for things like struct literals
and if-statements to take up the full line width configured above.
The formatting settings apply to all our Rust code right now — I think
we could improve this with https://github.com/dprint/dprint/issues/711
which lets us add per-directory `dprint` configuration files. However,
the `inherit: true` setting is not yet implemented (as far as I can
tell), so a nested configuration file will have to copy most or all of
the top-level file.
129 lines
3.3 KiB
Rust
129 lines
3.3 KiB
Rust
// Copyright 2023 Google LLC
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
#![allow(dead_code)]
|
|
|
|
// ANCHOR: solution
|
|
// ANCHOR: Package
|
|
#[derive(Debug)]
|
|
enum Language {
|
|
Rust,
|
|
Java,
|
|
Perl,
|
|
}
|
|
|
|
#[derive(Clone, Debug)]
|
|
struct Dependency {
|
|
name: String,
|
|
version_expression: String,
|
|
}
|
|
|
|
/// A representation of a software package.
|
|
#[derive(Debug)]
|
|
struct Package {
|
|
name: String,
|
|
version: String,
|
|
authors: Vec<String>,
|
|
dependencies: Vec<Dependency>,
|
|
language: Option<Language>,
|
|
}
|
|
|
|
impl Package {
|
|
// ANCHOR_END: Package
|
|
// ANCHOR: as_dependency
|
|
/// Return a representation of this package as a dependency, for use in
|
|
/// building other packages.
|
|
fn as_dependency(&self) -> Dependency {
|
|
// ANCHOR_END: as_dependency
|
|
Dependency {
|
|
name: self.name.clone(),
|
|
version_expression: self.version.clone(),
|
|
}
|
|
}
|
|
}
|
|
|
|
// ANCHOR: PackageBuilder
|
|
/// A builder for a Package. Use `build()` to create the `Package` itself.
|
|
struct PackageBuilder(Package);
|
|
|
|
impl PackageBuilder {
|
|
// ANCHOR_END: PackageBuilder
|
|
// ANCHOR: new
|
|
fn new(name: impl Into<String>) -> Self {
|
|
// ANCHOR_END: new
|
|
Self(Package {
|
|
name: name.into(),
|
|
version: "0.1".into(),
|
|
authors: vec![],
|
|
dependencies: vec![],
|
|
language: None,
|
|
})
|
|
}
|
|
|
|
// ANCHOR: version
|
|
/// Set the package version.
|
|
fn version(mut self, version: impl Into<String>) -> Self {
|
|
self.0.version = version.into();
|
|
self
|
|
}
|
|
// ANCHOR_END: version
|
|
|
|
// ANCHOR: authors
|
|
/// Set the package authors.
|
|
fn authors(mut self, authors: Vec<String>) -> Self {
|
|
// ANCHOR_END: authors
|
|
self.0.authors = authors;
|
|
self
|
|
}
|
|
|
|
// ANCHOR: dependency
|
|
/// Add an additional dependency.
|
|
fn dependency(mut self, dependency: Dependency) -> Self {
|
|
// ANCHOR_END: dependency
|
|
self.0.dependencies.push(dependency);
|
|
self
|
|
}
|
|
|
|
// ANCHOR: language
|
|
/// Set the language. If not set, language defaults to None.
|
|
fn language(mut self, language: Language) -> Self {
|
|
// ANCHOR_END: language
|
|
self.0.language = Some(language);
|
|
self
|
|
}
|
|
|
|
// ANCHOR: build
|
|
fn build(self) -> Package {
|
|
self.0
|
|
}
|
|
}
|
|
// ANCHOR_END: build
|
|
|
|
// ANCHOR: main
|
|
fn main() {
|
|
let base64 = PackageBuilder::new("base64").version("0.13").build();
|
|
println!("base64: {base64:?}");
|
|
let log =
|
|
PackageBuilder::new("log").version("0.4").language(Language::Rust).build();
|
|
println!("log: {log:?}");
|
|
let serde = PackageBuilder::new("serde")
|
|
.authors(vec!["djmitche".into()])
|
|
.version(String::from("4.0"))
|
|
.dependency(base64.as_dependency())
|
|
.dependency(log.as_dependency())
|
|
.build();
|
|
println!("serde: {serde:?}");
|
|
}
|
|
// ANCHOR_END: main
|