Skip to content

Commit

Permalink
Fix various incorrect uses of its vs it's.
Browse files Browse the repository at this point in the history
These errors can make reading comments and documentation
unnecessarily confusing for users and contributors who
do not speak English as their first language.
  • Loading branch information
amcn authored and jpakkane committed Sep 14, 2024
1 parent 7813354 commit 050b788
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions docs/markdown/Qt6-module.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Compiles Qt's resources collection files (.qrc) into c++ files for compilation.
It takes no positional arguments, and the following keyword arguments:
- `name` (string | empty): if provided a single .cpp file will be generated,
and the output of all qrc files will be combined in this file, otherwise
each qrc file be written to it's own cpp file.
each qrc file be written to its own cpp file.
- `sources` (File | string | custom_target | custom_target index | generator_output)[]:
A list of sources to be transpiled. Required, must have at least one source<br/>
*New in 0.60.0*: support for custom_target, custom_target_index, and generator_output.
Expand Down Expand Up @@ -111,7 +111,7 @@ This method takes the following keyword arguments:
directory. For instance, when a file called `subdir/one.input` is processed
it generates a file `{target private directory}/subdir/one.out` when `true`,
and `{target private directory}/one.out` when `false` (default).

It returns an array of targets and sources to pass to a compilation target.

## compile_translations
Expand Down
2 changes: 1 addition & 1 deletion mesonbuild/backend/xcodebackend.py
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ def generate_build_phase_map(self) -> None:
# generate id for our own target-name
t.buildphasemap = {}
t.buildphasemap[tname] = self.gen_id()
# each target can have it's own Frameworks/Sources/..., generate id's for those
# each target can have its own Frameworks/Sources/..., generate id's for those
t.buildphasemap['Frameworks'] = self.gen_id()
t.buildphasemap['Resources'] = self.gen_id()
t.buildphasemap['Sources'] = self.gen_id()
Expand Down
4 changes: 2 additions & 2 deletions mesonbuild/compilers/detect.py
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ def _detect_c_or_cpp_compiler(env: 'Environment', lang: str, for_machine: Machin
compiler_name = os.path.basename(compiler[0])

if any(os.path.basename(x) in {'cl', 'cl.exe', 'clang-cl', 'clang-cl.exe'} for x in compiler):
# Watcom C provides it's own cl.exe clone that mimics an older
# Watcom C provides its own cl.exe clone that mimics an older
# version of Microsoft's compiler. Since Watcom's cl.exe is
# just a wrapper, we skip using it if we detect its presence
# so as not to confuse Meson when configuring for MSVC.
Expand Down Expand Up @@ -1026,7 +1026,7 @@ def detect_rust_compiler(env: 'Environment', for_machine: MachineChoice) -> Rust
version = search_version(out)
cls: T.Type[RustCompiler] = rust.RustCompiler

# Clippy is a wrapper around rustc, but it doesn't have rustc in it's
# Clippy is a wrapper around rustc, but it doesn't have rustc in its
# output. We can otherwise treat it as rustc.
if 'clippy' in out:
# clippy returns its own version and not the rustc version by
Expand Down
6 changes: 3 additions & 3 deletions mesonbuild/dependencies/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ def get_compile_args(self) -> T.List[str]:
return self.compile_args

def get_all_compile_args(self) -> T.List[str]:
"""Get the compile arguments from this dependency and it's sub dependencies."""
"""Get the compile arguments from this dependency and its sub dependencies."""
return list(itertools.chain(self.get_compile_args(),
*(d.get_all_compile_args() for d in self.ext_deps)))

Expand All @@ -167,7 +167,7 @@ def get_link_args(self, language: T.Optional[str] = None, raw: bool = False) ->
return self.link_args

def get_all_link_args(self) -> T.List[str]:
"""Get the link arguments from this dependency and it's sub dependencies."""
"""Get the link arguments from this dependency and its sub dependencies."""
return list(itertools.chain(self.get_link_args(),
*(d.get_all_link_args() for d in self.ext_deps)))

Expand Down Expand Up @@ -213,7 +213,7 @@ def get_partial_dependency(self, *, compile_args: bool = False,
compile_args -- any compile args
link_args -- any link args
Additionally the new dependency will have the version parameter of it's
Additionally the new dependency will have the version parameter of its
parent (if any) and the requested values of any dependencies will be
added as well.
"""
Expand Down
2 changes: 1 addition & 1 deletion mesonbuild/dependencies/configtool.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class ConfigToolDependency(ExternalDependency):
Takes the following extra keys in kwargs that it uses internally:
:tools List[str]: A list of tool names to use
:version_arg str: The argument to pass to the tool to get it's version
:version_arg str: The argument to pass to the tool to get its version
:skip_version str: The argument to pass to the tool to ignore its version
(if ``version_arg`` fails, but it may start accepting it in the future)
Because some tools are stupid and don't accept --version
Expand Down
2 changes: 1 addition & 1 deletion mesonbuild/interpreter/kwargs.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class ExtractRequired(TypedDict):
"""Keyword Arguments consumed by the `extract_required_kwargs` function.
Any function that uses the `required` keyword argument which accepts either
a boolean or a feature option should inherit it's arguments from this class.
a boolean or a feature option should inherit its arguments from this class.
"""

required: T.Union[bool, options.UserFeatureOption]
Expand Down
2 changes: 1 addition & 1 deletion mesonbuild/mconf.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ def print_aligned(self) -> None:
This prints the generated output in an aligned, pretty form. it aims
for a total width of 160 characters, but will use whatever the tty
reports it's value to be. Though this is much wider than the standard
reports its value to be. Though this is much wider than the standard
80 characters of terminals, and even than the newer 120, compressing
it to those lengths makes the output hard to read.
Expand Down
4 changes: 2 additions & 2 deletions mesonbuild/modules/rust.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def __init__(self, interpreter: Interpreter) -> None:
def test(self, state: ModuleState, args: T.Tuple[str, BuildTarget], kwargs: FuncTest) -> ModuleReturnValue:
"""Generate a rust test target from a given rust target.
Rust puts it's unitests inside it's main source files, unlike most
Rust puts its unitests inside its main source files, unlike most
languages that put them in external files. This means that normally
you have to define two separate targets with basically the same
arguments to get tests:
Expand Down Expand Up @@ -207,7 +207,7 @@ def test(self, state: ModuleState, args: T.Tuple[str, BuildTarget], kwargs: Func
DEPENDENCIES_KW.evolve(since='1.0.0'),
)
def bindgen(self, state: ModuleState, args: T.List, kwargs: FuncBindgen) -> ModuleReturnValue:
"""Wrapper around bindgen to simplify it's use.
"""Wrapper around bindgen to simplify its use.
The main thing this simplifies is the use of `include_directory`
objects, instead of having to pass a plethora of `-I` arguments.
Expand Down
2 changes: 1 addition & 1 deletion mesonbuild/programs.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ def get_version(self, interpreter: T.Optional['Interpreter'] = None) -> str:
@classmethod
def from_bin_list(cls, env: 'Environment', for_machine: MachineChoice, name: str) -> 'ExternalProgram':
# There is a static `for_machine` for this class because the binary
# always runs on the build platform. (It's host platform is our build
# always runs on the build platform. (Its host platform is our build
# platform.) But some external programs have a target platform, so this
# is what we are specifying here.
command = env.lookup_binary_entry(for_machine, name)
Expand Down

0 comments on commit 050b788

Please sign in to comment.