Merge pull request #192 from guanqun/typo-fix

some random typo fixes
This commit is contained in:
Aleksey Kladov 2019-08-22 20:15:03 +03:00 committed by GitHub
commit b3d3e8f944
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 8 deletions

6
FAQ.md
View file

@ -18,15 +18,15 @@ revision counters from Glimmer, instead), I still like the name.
You may have noticed that Salsa "feels" a lot like an ECS in some
ways. That's true -- Salsa's queries are a bit like *components* (and
the keys to the queries are a bit like *entitites*). But there is one
the keys to the queries are a bit like *entities*). But there is one
big difference: **ECS is -- at its heart -- a mutable system**. You
can get or set a component of some entity whenever you like. In
contrast, salsa's queries define **define "derived values" via pure
contrast, salsa's queries **define "derived values" via pure
computations**.
Partly as a consequence, ECS doesn't handle incremental updates for
you. When you update some component of some entity, you have to ensure
that other entities' components are upated appropriately.
that other entities' components are updated appropriately.
Finally, ECS offers interesting metadata and "aspect-like" facilities,
such as iterating over all entities that share certain components.

View file

@ -7,9 +7,8 @@ on the the incremental recompilation techniques that we built for
rustc, and many (but not all) of its users are building compilers or
other similar tooling.
If you'd like to learn more about Salsa, you can check out [the [Hello
World
example](https://github.com/salsa-rs/salsa/blob/master/examples/hello_world/main.rs)
If you'd like to learn more about Salsa, you can check out the
[Hello World example](https://github.com/salsa-rs/salsa/blob/master/examples/hello_world/main.rs)
in the repository, or watch some of our [YouTube videos](./videos.md).
If you'd like to chat about Salsa, or you think you might like to

View file

@ -7,7 +7,7 @@ use std::sync::Arc;
// functions) that are defined in one particular spot. Each query
// group is defined by a trait decorated with the
// `#[salsa::query_group]` attribute. The trait defines one method per
// query, with the argments to the method being the query **keys** and
// query, with the arguments to the method being the query **keys** and
// the return value being the query's **value**.
//
// Along with the trait, each query group has an associated

View file

@ -417,7 +417,7 @@ where
debug!("sweep({:?}): in-progress", self);
}
// Otherwise, drop only value or the whole memo accoring to the
// Otherwise, drop only value or the whole memo according to the
// strategy.
QueryState::Memoized(memo) => {
debug!(