Skip to content

Commit

Permalink
Respectful code modifications
Browse files Browse the repository at this point in the history
Where possible, replaces contentious word use with recommended alternatives.
  • Loading branch information
filmil committed Feb 1, 2021
1 parent 92bca43 commit 3f09bd5
Show file tree
Hide file tree
Showing 25 changed files with 38 additions and 38 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: Test
on:
push:
branches: [ master ]
branches: [ main ]
pull_request:
branches: [ master ]
branches: [ main ]

jobs:
test-default-features:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Item | Description
---------- | -----------
ICU 63..68 | [![Test status](https://github.com/google/rust_icu/workflows/Test/badge.svg)](https://github.com/google/rust_icu/workflows/Test/badge.svg)
Source | https://github.com/google/rust_icu
README | https://github.com/google/rust_icu/blob/master/README.md
README | https://github.com/google/rust_icu/blob/main/README.md
Coverage | [View report](/coverage/report.md)
Docs | https://docs.rs/crate/rust_icu

Expand Down Expand Up @@ -123,7 +123,7 @@ development environment will use the same settings, we opted to offer certain
features (below) as configuration options.

While our intention is to keep the list of features below up to date with the
[actual list in `Cargo.toml`](https://github.com/google/rust_icu/blob/master/Cargo.toml),
[actual list in `Cargo.toml`](https://github.com/google/rust_icu/blob/main/Cargo.toml),
the list may periodically go out of date.

To use any of the features, you will need to activate the feature in *all* the
Expand Down
6 changes: 3 additions & 3 deletions docs/releasing.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ to the build environments.
5. Release a buildenv tag:

```
git pull --rebase origin master # Ensure that this commit is pushed.
git pull --rebase origin main # Ensure that this commit is pushed.
git tag -a buildenv-0.0.5 # Replace 0.0.5 with the version you intend to release.
make buildenv # Build and push the container; requires push access to the repo.
git push origin --tags # Pushes the tag to the rust_icu repository
Expand All @@ -76,7 +76,7 @@ to the build environments.

## Prerequisites

* A clean git repository; that is, a repo on a master branch that has no unpushed commits,
* A clean git repository; that is, a repo on a main branch that has no unpushed commits,
and no other staged or unstaged changes.

* Write permission to publish the crates on `crates.io`.
Expand All @@ -102,7 +102,7 @@ the new version will be `0.0.5`.
```

The above command will generate changes to the library that need to be committed
to master. Create a PR to do so and commit.
to main. Create a PR to do so and commit.

4. Publish the result to `crates.io`:

Expand Down
2 changes: 1 addition & 1 deletion ecma402_traits/src/listformat.rs
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ pub trait Format {
///
/// This makes it unnecessary for [Format] to implement its own, and can
/// completely avoid constructing any intermediary representation. This, in turn,
/// allows the user to provide a purpose built formatter, or an "exotic" one if needed.
/// allows the user to provide a purpose built formatter, or a custom one if needed.
///
/// A purpose built formatter could be one that formats into a fixed-size buffer; or
/// another that knows how to format strings into a DOM. If ECMA 402 compatibility is
Expand Down
2 changes: 1 addition & 1 deletion proposals/ecma402_listformat/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@ pub mod listformat {
///
/// This makes it unnecessary for [Format] to implement its own, and can
/// completely avoid constructing any intermediary representation. This, in turn,
/// allows the user to provide a purpose built formatter, or an "exotic" one if needed.
/// allows the user to provide a purpose built formatter, or a custom one if needed.
///
/// A purpose built formatter could be one that formats into a fixed-size buffer; or
/// another that knows how to format strings into a DOM. If ECMA 402 compatibility is
Expand Down
2 changes: 1 addition & 1 deletion rust_icu/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -155,4 +155,4 @@ icu_version_68_plus = [
maintenance = { status = "actively-developed" }
is-it-maintained-issue-resolution = { repository = "google/rust_icu" }
is-it-maintained-open-issues = { repository = "google/rust_icu" }
travis-ci = { repository = "google/rust_icu", branch = "master" }
travis-ci = { repository = "google/rust_icu", branch = "main" }
2 changes: 1 addition & 1 deletion rust_icu_common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ icu_version_68_plus = [
maintenance = { status = "actively-developed" }
is-it-maintained-issue-resolution = { repository = "google/rust_icu" }
is-it-maintained-open-issues = { repository = "google/rust_icu" }
travis-ci = { repository = "google/rust_icu", branch = "master" }
travis-ci = { repository = "google/rust_icu", branch = "main" }
20 changes: 10 additions & 10 deletions rust_icu_common/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,11 @@ impl Error {
/// This error check explicitly ignores the buffer overflow error when reporting whether it
/// contains an error condition.
///
/// Preflight calls to ICU libraries do a dummy scan of the input to determine the buffer sizes
/// required on the output in case of conversion calls such as `ucal_strFromUTF8`. The way
/// this call is made is to offer a zero-capacity buffer (which could be pointed to by a `NULL`
/// pointer), and then call the respective function. The function will compute the buffer
/// size, but will also return a bogus buffer overflow error.
/// Preflight calls to ICU libraries do a read-only scan of the input to determine the buffer
/// sizes required on the output in case of conversion calls such as `ucal_strFromUTF8`. The
/// way this call is made is to offer a zero-capacity buffer (which could be pointed to by a
/// `NULL` pointer), and then call the respective function. The function will compute the
/// buffer size, but will also return a bogus buffer overflow error.
pub fn ok_preflight(status: sys::UErrorCode) -> Result<(), Self> {
if status > Self::OK_CODE && status != sys::UErrorCode::U_BUFFER_OVERFLOW_ERROR {
Err(Error::Sys(status))
Expand Down Expand Up @@ -105,11 +105,11 @@ impl Error {
/// This error check explicitly ignores the buffer overflow error when reporting whether it
/// contains an error condition.
///
/// Preflight calls to ICU libraries do a dummy scan of the input to determine the buffer sizes
/// required on the output in case of conversion calls such as `ucal_strFromUTF8`. The way
/// this call is made is to offer a zero-capacity buffer (which could be pointed to by a `NULL`
/// pointer), and then call the respective function. The function will compute the buffer
/// size, but will also return a bogus buffer overflow error.
/// Preflight calls to ICU libraries do a read-only scan of the input to determine the buffer
/// sizes required on the output in case of conversion calls such as `ucal_strFromUTF8`. The
/// way this call is made is to offer a zero-capacity buffer (which could be pointed to by a
/// `NULL` pointer), and then call the respective function. The function will compute the
/// buffer size, but will also return a bogus buffer overflow error.
pub fn is_preflight_err(&self) -> bool {
// We may expand the set of error codes that are exempt from error checks in preflight.
self.is_err() && !self.is_code(sys::UErrorCode::U_BUFFER_OVERFLOW_ERROR)
Expand Down
2 changes: 1 addition & 1 deletion rust_icu_ecma402/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -108,4 +108,4 @@ icu_version_68_plus = [
maintenance = { status = "actively-developed" }
is-it-maintained-issue-resolution = { repository = "google/rust_icu" }
is-it-maintained-open-issues = { repository = "google/rust_icu" }
travis-ci = { repository = "google/rust_icu", branch = "master" }
travis-ci = { repository = "google/rust_icu", branch = "main" }
2 changes: 1 addition & 1 deletion rust_icu_sys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ icu_version_68_plus = []
maintenance = { status = "actively-developed" }
is-it-maintained-issue-resolution = { repository = "google/rust_icu" }
is-it-maintained-open-issues = { repository = "google/rust_icu" }
travis-ci = { repository = "google/rust_icu", branch = "master" }
travis-ci = { repository = "google/rust_icu", branch = "main" }
2 changes: 1 addition & 1 deletion rust_icu_ubrk/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,4 @@ icu_version_68_plus = [
is-it-maintained-issue-resolution = { repository = "google/rust_icu" }
is-it-maintained-open-issues = { repository = "google/rust_icu" }
maintenance = { status = "actively-developed" }
travis-ci = { repository = "google/rust_icu", branch = "master" }
travis-ci = { repository = "google/rust_icu", branch = "main" }
2 changes: 1 addition & 1 deletion rust_icu_ucal/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,4 @@ icu_version_68_plus = [
maintenance = { status = "actively-developed" }
is-it-maintained-issue-resolution = { repository = "google/rust_icu" }
is-it-maintained-open-issues = { repository = "google/rust_icu" }
travis-ci = { repository = "google/rust_icu", branch = "master" }
travis-ci = { repository = "google/rust_icu", branch = "main" }
2 changes: 1 addition & 1 deletion rust_icu_ucol/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,4 @@ icu_version_68_plus = [
maintenance = { status = "actively-developed" }
is-it-maintained-issue-resolution = { repository = "google/rust_icu" }
is-it-maintained-open-issues = { repository = "google/rust_icu" }
travis-ci = { repository = "google/rust_icu", branch = "master" }
travis-ci = { repository = "google/rust_icu", branch = "main" }
2 changes: 1 addition & 1 deletion rust_icu_udat/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -98,4 +98,4 @@ icu_version_68_plus = [
maintenance = { status = "actively-developed" }
is-it-maintained-issue-resolution = { repository = "google/rust_icu" }
is-it-maintained-open-issues = { repository = "google/rust_icu" }
travis-ci = { repository = "google/rust_icu", branch = "master" }
travis-ci = { repository = "google/rust_icu", branch = "main" }
2 changes: 1 addition & 1 deletion rust_icu_udata/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ icu_version_68_plus = [
maintenance = { status = "actively-developed" }
is-it-maintained-issue-resolution = { repository = "google/rust_icu" }
is-it-maintained-open-issues = { repository = "google/rust_icu" }
travis-ci = { repository = "google/rust_icu", branch = "master" }
travis-ci = { repository = "google/rust_icu", branch = "main" }
2 changes: 1 addition & 1 deletion rust_icu_uenum/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@ icu_version_68_plus = [
maintenance = { status = "actively-developed" }
is-it-maintained-issue-resolution = { repository = "google/rust_icu" }
is-it-maintained-open-issues = { repository = "google/rust_icu" }
travis-ci = { repository = "google/rust_icu", branch = "master" }
travis-ci = { repository = "google/rust_icu", branch = "main" }
2 changes: 1 addition & 1 deletion rust_icu_uformattable/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,4 @@ icu_version_68_plus = [
maintenance = { status = "actively-developed" }
is-it-maintained-issue-resolution = { repository = "google/rust_icu" }
is-it-maintained-open-issues = { repository = "google/rust_icu" }
travis-ci = { repository = "google/rust_icu", branch = "master" }
travis-ci = { repository = "google/rust_icu", branch = "main" }
2 changes: 1 addition & 1 deletion rust_icu_ulistformatter/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,4 @@ icu_version_68_plus = [
maintenance = { status = "actively-developed" }
is-it-maintained-issue-resolution = { repository = "google/rust_icu" }
is-it-maintained-open-issues = { repository = "google/rust_icu" }
travis-ci = { repository = "google/rust_icu", branch = "master" }
travis-ci = { repository = "google/rust_icu", branch = "main" }
2 changes: 1 addition & 1 deletion rust_icu_uloc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,4 @@ anyhow = "1.0"
maintenance = { status = "actively-developed" }
is-it-maintained-issue-resolution = { repository = "google/rust_icu" }
is-it-maintained-open-issues = { repository = "google/rust_icu" }
travis-ci = { repository = "google/rust_icu", branch = "master" }
travis-ci = { repository = "google/rust_icu", branch = "main" }
2 changes: 1 addition & 1 deletion rust_icu_umsg/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,4 @@ icu_version_68_plus = [
maintenance = { status = "actively-developed" }
is-it-maintained-issue-resolution = { repository = "google/rust_icu" }
is-it-maintained-open-issues = { repository = "google/rust_icu" }
travis-ci = { repository = "google/rust_icu", branch = "master" }
travis-ci = { repository = "google/rust_icu", branch = "main" }
2 changes: 1 addition & 1 deletion rust_icu_unum/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,4 @@ icu_version_68_plus = [
maintenance = { status = "actively-developed" }
is-it-maintained-issue-resolution = { repository = "google/rust_icu" }
is-it-maintained-open-issues = { repository = "google/rust_icu" }
travis-ci = { repository = "google/rust_icu", branch = "master" }
travis-ci = { repository = "google/rust_icu", branch = "main" }
2 changes: 1 addition & 1 deletion rust_icu_unumberformatter/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -94,4 +94,4 @@ icu_version_68_plus = [
maintenance = { status = "actively-developed" }
is-it-maintained-issue-resolution = { repository = "google/rust_icu" }
is-it-maintained-open-issues = { repository = "google/rust_icu" }
travis-ci = { repository = "google/rust_icu", branch = "master" }
travis-ci = { repository = "google/rust_icu", branch = "main" }
2 changes: 1 addition & 1 deletion rust_icu_upluralrules/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,4 @@ icu_version_68_plus = [
maintenance = { status = "actively-developed" }
is-it-maintained-issue-resolution = { repository = "google/rust_icu" }
is-it-maintained-open-issues = { repository = "google/rust_icu" }
travis-ci = { repository = "google/rust_icu", branch = "master" }
travis-ci = { repository = "google/rust_icu", branch = "main" }
2 changes: 1 addition & 1 deletion rust_icu_utext/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@ icu_version_68_plus = [
maintenance = { status = "actively-developed" }
is-it-maintained-issue-resolution = { repository = "google/rust_icu" }
is-it-maintained-open-issues = { repository = "google/rust_icu" }
travis-ci = { repository = "google/rust_icu", branch = "master" }
travis-ci = { repository = "google/rust_icu", branch = "main" }
2 changes: 1 addition & 1 deletion rust_icu_utrans/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,4 @@ icu_version_68_plus = [
is-it-maintained-issue-resolution = { repository = "google/rust_icu" }
is-it-maintained-open-issues = { repository = "google/rust_icu" }
maintenance = { status = "actively-developed" }
travis-ci = { repository = "google/rust_icu", branch = "master" }
travis-ci = { repository = "google/rust_icu", branch = "main" }

0 comments on commit 3f09bd5

Please sign in to comment.