Fix some typos
This commit is contained in:
parent
59f6b8338e
commit
3ab86fbab2
53 changed files with 83 additions and 82 deletions
|
@ -333,7 +333,7 @@ impl<'a> Builder<'a> {
|
|||
StepDescription::run(&Builder::get_step_descriptions(Kind::Doc), self, paths);
|
||||
}
|
||||
|
||||
/// Obtain a compiler at a given stage and for a given host. Explictly does
|
||||
/// Obtain a compiler at a given stage and for a given host. Explicitly does
|
||||
/// not take `Compiler` since all `Compiler` instances are meant to be
|
||||
/// obtained through this function, since it ensures that they are valid
|
||||
/// (i.e., built and assembled).
|
||||
|
@ -501,7 +501,7 @@ impl<'a> Builder<'a> {
|
|||
// crates). Let's say, for example that rustc itself depends on the
|
||||
// bitflags crate. If an external crate then depends on the
|
||||
// bitflags crate as well, we need to make sure they don't
|
||||
// conflict, even if they pick the same verison of bitflags. We'll
|
||||
// conflict, even if they pick the same version of bitflags. We'll
|
||||
// want to make sure that e.g. a plugin and rustc each get their
|
||||
// own copy of bitflags.
|
||||
|
||||
|
|
|
@ -306,7 +306,7 @@ impl Step for Standalone {
|
|||
///
|
||||
/// This will list all of `src/doc` looking for markdown files and appropriately
|
||||
/// perform transformations like substituting `VERSION`, `SHORT_HASH`, and
|
||||
/// `STAMP` alongw ith providing the various header/footer HTML we've cutomized.
|
||||
/// `STAMP` along with providing the various header/footer HTML we've customized.
|
||||
///
|
||||
/// In the end, this is just a glorified wrapper around rustdoc!
|
||||
fn run(self, builder: &Builder) {
|
||||
|
|
|
@ -240,7 +240,7 @@ impl Layout {
|
|||
///
|
||||
/// Returns `Some((k, offset))`, where `k` is layout of the concatenated
|
||||
/// record and `offset` is the relative location, in bytes, of the
|
||||
/// start of the `next` embedded witnin the concatenated record
|
||||
/// start of the `next` embedded within the concatenated record
|
||||
/// (assuming that the record itself starts at offset 0).
|
||||
///
|
||||
/// On arithmetic overflow, returns `None`.
|
||||
|
@ -297,7 +297,7 @@ impl Layout {
|
|||
///
|
||||
/// Returns `(k, offset)`, where `k` is layout of the concatenated
|
||||
/// record and `offset` is the relative location, in bytes, of the
|
||||
/// start of the `next` embedded witnin the concatenated record
|
||||
/// start of the `next` embedded within the concatenated record
|
||||
/// (assuming that the record itself starts at offset 0).
|
||||
///
|
||||
/// (The `offset` is always the same as `self.size()`; we use this
|
||||
|
@ -544,7 +544,7 @@ pub unsafe trait Alloc {
|
|||
/// practice this means implementors should eschew allocating,
|
||||
/// especially from `self` (directly or indirectly).
|
||||
///
|
||||
/// Implementions of the allocation and reallocation methods
|
||||
/// Implementations of the allocation and reallocation methods
|
||||
/// (e.g. `alloc`, `alloc_one`, `realloc`) are discouraged from
|
||||
/// panicking (or aborting) in the event of memory exhaustion;
|
||||
/// instead they should return an appropriate error from the
|
||||
|
|
|
@ -653,7 +653,7 @@ impl String {
|
|||
/// * `capacity` needs to be the correct value.
|
||||
///
|
||||
/// Violating these may cause problems like corrupting the allocator's
|
||||
/// internal datastructures.
|
||||
/// internal data structures.
|
||||
///
|
||||
/// The ownership of `ptr` is effectively transferred to the
|
||||
/// `String` which may then deallocate, reallocate or change the
|
||||
|
|
|
@ -374,7 +374,7 @@ impl<T> Vec<T> {
|
|||
/// * `capacity` needs to be the capacity that the pointer was allocated with.
|
||||
///
|
||||
/// Violating these may cause problems like corrupting the allocator's
|
||||
/// internal datastructures. For example it is **not** safe
|
||||
/// internal data structures. For example it is **not** safe
|
||||
/// to build a `Vec<u8>` from a pointer to a C `char` array and a `size_t`.
|
||||
///
|
||||
/// The ownership of `ptr` is effectively transferred to the
|
||||
|
|
|
@ -66,7 +66,7 @@ pub trait Place<Data: ?Sized> {
|
|||
/// or `Copy`, since the `make_place` method takes `self` by value.
|
||||
#[unstable(feature = "placement_new_protocol", issue = "27779")]
|
||||
pub trait Placer<Data: ?Sized> {
|
||||
/// `Place` is the intermedate agent guarding the
|
||||
/// `Place` is the intermediate agent guarding the
|
||||
/// uninitialized state for `Data`.
|
||||
type Place: InPlace<Data>;
|
||||
|
||||
|
|
|
@ -548,7 +548,7 @@ impl<'a> LabelText<'a> {
|
|||
}
|
||||
|
||||
/// Renders text as string suitable for a label in a .dot file.
|
||||
/// This includes quotes or suitable delimeters.
|
||||
/// This includes quotes or suitable delimiters.
|
||||
pub fn to_dot_string(&self) -> String {
|
||||
match self {
|
||||
&LabelStr(ref s) => format!("\"{}\"", s.escape_default()),
|
||||
|
|
|
@ -87,7 +87,7 @@ pub enum NestedVisitorMap<'this, 'tcx: 'this> {
|
|||
/// Do not visit nested item-like things, but visit nested things
|
||||
/// that are inside of an item-like.
|
||||
///
|
||||
/// **This is the most common choice.** A very commmon pattern is
|
||||
/// **This is the most common choice.** A very common pattern is
|
||||
/// to use `visit_all_item_likes()` as an outer loop,
|
||||
/// and to have the visitor that visits the contents of each item
|
||||
/// using this setting.
|
||||
|
|
|
@ -248,7 +248,7 @@ pub struct Map<'hir> {
|
|||
pub forest: &'hir Forest,
|
||||
|
||||
/// Same as the dep_graph in forest, just available with one fewer
|
||||
/// deref. This is a gratuitious micro-optimization.
|
||||
/// deref. This is a gratuitous micro-optimization.
|
||||
pub dep_graph: DepGraph,
|
||||
|
||||
/// NodeIds are sequential integers from 0, so we can be
|
||||
|
|
|
@ -496,7 +496,7 @@ impl Crate {
|
|||
&self.impl_items[&id]
|
||||
}
|
||||
|
||||
/// Visits all items in the crate in some determinstic (but
|
||||
/// Visits all items in the crate in some deterministic (but
|
||||
/// unspecified) order. If you just need to process every item,
|
||||
/// but don't care about nesting, this method is the best choice.
|
||||
///
|
||||
|
|
|
@ -169,7 +169,7 @@ impl<'a, 'gcx, 'tcx> At<'a, 'gcx, 'tcx> {
|
|||
}
|
||||
|
||||
/// Sets the "trace" values that will be used for
|
||||
/// error-repporting, but doesn't actually perform any operation
|
||||
/// error-reporting, but doesn't actually perform any operation
|
||||
/// yet (this is useful when you want to set the trace using
|
||||
/// distinct values from those you wish to operate upon).
|
||||
pub fn trace<T>(self,
|
||||
|
|
|
@ -589,7 +589,7 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
|
|||
(result, map)
|
||||
}
|
||||
|
||||
/// Searches the region constriants created since `snapshot` was started
|
||||
/// Searches the region constraints created since `snapshot` was started
|
||||
/// and checks to determine whether any of the skolemized regions created
|
||||
/// in `skol_map` would "escape" -- meaning that they are related to
|
||||
/// other regions in some way. If so, the higher-ranked subtyping doesn't
|
||||
|
|
|
@ -46,7 +46,7 @@ pub trait LatticeDir<'f, 'gcx: 'f+'tcx, 'tcx: 'f> : TypeRelation<'f, 'gcx, 'tcx>
|
|||
// the LUB/GLB of `a` and `b` as appropriate.
|
||||
//
|
||||
// Subtle hack: ordering *may* be significant here. This method
|
||||
// relates `v` to `a` first, which may help us to avoid unecessary
|
||||
// relates `v` to `a` first, which may help us to avoid unnecessary
|
||||
// type variable obligations. See caller for details.
|
||||
fn relate_bound(&mut self, v: Ty<'tcx>, a: Ty<'tcx>, b: Ty<'tcx>) -> RelateResult<'tcx, ()>;
|
||||
}
|
||||
|
|
|
@ -128,7 +128,7 @@ pub enum UndoLogEntry<'tcx> {
|
|||
/// We added the given `given`
|
||||
AddGiven(Region<'tcx>, ty::RegionVid),
|
||||
|
||||
/// We added a GLB/LUB "combinaton variable"
|
||||
/// We added a GLB/LUB "combination variable"
|
||||
AddCombination(CombineMapType, TwoRegions<'tcx>),
|
||||
|
||||
/// During skolemization, we sometimes purge entries from the undo
|
||||
|
|
|
@ -69,7 +69,7 @@ pub struct LintStore {
|
|||
/// is true if the lint group was added by a plugin.
|
||||
lint_groups: FxHashMap<&'static str, (Vec<LintId>, bool)>,
|
||||
|
||||
/// Extra info for future incompatibility lints, descibing the
|
||||
/// Extra info for future incompatibility lints, describing the
|
||||
/// issue or RFC that caused the incompatibility.
|
||||
future_incompatible: FxHashMap<LintId, FutureIncompatibleInfo>,
|
||||
}
|
||||
|
|
|
@ -695,7 +695,7 @@ impl<'tcx> Debug for TerminatorKind<'tcx> {
|
|||
|
||||
impl<'tcx> TerminatorKind<'tcx> {
|
||||
/// Write the "head" part of the terminator; that is, its name and the data it uses to pick the
|
||||
/// successor basic block, if any. The only information not inlcuded is the list of possible
|
||||
/// successor basic block, if any. The only information not included is the list of possible
|
||||
/// successors, which may be rendered differently between the text and the graphviz format.
|
||||
pub fn fmt_head<W: Write>(&self, fmt: &mut W) -> fmt::Result {
|
||||
use self::TerminatorKind::*;
|
||||
|
|
|
@ -112,7 +112,7 @@ pub struct Session {
|
|||
|
||||
/// Map from imported macro spans (which consist of
|
||||
/// the localized span for the macro body) to the
|
||||
/// macro name and defintion span in the source crate.
|
||||
/// macro name and definition span in the source crate.
|
||||
pub imported_macro_spans: RefCell<HashMap<Span, (String, Span)>>,
|
||||
|
||||
incr_comp_session: RefCell<IncrCompSession>,
|
||||
|
@ -828,7 +828,7 @@ pub fn compile_result_from_err_count(err_count: usize) -> CompileResult {
|
|||
#[inline(never)]
|
||||
pub fn bug_fmt(file: &'static str, line: u32, args: fmt::Arguments) -> ! {
|
||||
// this wrapper mostly exists so I don't have to write a fully
|
||||
// qualified path of None::<Span> inside the bug!() macro defintion
|
||||
// qualified path of None::<Span> inside the bug!() macro definition
|
||||
opt_span_bug_fmt(file, line, None::<Span>, args);
|
||||
}
|
||||
|
||||
|
|
|
@ -111,8 +111,8 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
|
|||
}
|
||||
}
|
||||
|
||||
// returns if `cond` not occuring implies that `error` does not occur - i.e. that
|
||||
// `error` occuring implies that `cond` occurs.
|
||||
// returns if `cond` not occurring implies that `error` does not occur - i.e. that
|
||||
// `error` occurring implies that `cond` occurs.
|
||||
fn error_implies(&self,
|
||||
cond: &ty::Predicate<'tcx>,
|
||||
error: &ty::Predicate<'tcx>)
|
||||
|
|
|
@ -1364,7 +1364,7 @@ impl<'tcx> ProjectionCache<'tcx> {
|
|||
}
|
||||
|
||||
/// Try to start normalize `key`; returns an error if
|
||||
/// normalization already occured (this error corresponds to a
|
||||
/// normalization already occurred (this error corresponds to a
|
||||
/// cache hit, so it's actually a good thing).
|
||||
fn try_start(&mut self, key: ty::ProjectionTy<'tcx>)
|
||||
-> Result<(), ProjectionCacheEntry<'tcx>> {
|
||||
|
|
|
@ -95,7 +95,7 @@ impl<'a, 'gcx, 'tcx> Children {
|
|||
}
|
||||
|
||||
/// Attempt to insert an impl into this set of children, while comparing for
|
||||
/// specialiation relationships.
|
||||
/// specialization relationships.
|
||||
fn insert(&mut self,
|
||||
tcx: TyCtxt<'a, 'gcx, 'tcx>,
|
||||
impl_def_id: DefId,
|
||||
|
@ -206,7 +206,7 @@ impl<'a, 'gcx, 'tcx> Graph {
|
|||
|
||||
// if the reference itself contains an earlier error (e.g., due to a
|
||||
// resolution failure), then we just insert the impl at the top level of
|
||||
// the graph and claim that there's no overlap (in order to supress
|
||||
// the graph and claim that there's no overlap (in order to suppress
|
||||
// bogus errors).
|
||||
if trait_ref.references_error() {
|
||||
debug!("insert: inserting dummy node for erroneous TraitRef {:?}, \
|
||||
|
|
|
@ -24,7 +24,7 @@ use ty::{DefId, DefIdTree};
|
|||
#[derive(Clone)]
|
||||
pub struct DefIdForest {
|
||||
/// The minimal set of DefIds required to represent the whole set.
|
||||
/// If A and B are DefIds in the DefIdForest, and A is a desecendant
|
||||
/// If A and B are DefIds in the DefIdForest, and A is a descendant
|
||||
/// of B, then only B will be in root_ids.
|
||||
/// We use a SmallVec here because (for its use for cacheing inhabitedness)
|
||||
/// its rare that this will contain even two ids.
|
||||
|
@ -61,7 +61,7 @@ impl<'a, 'gcx, 'tcx> DefIdForest {
|
|||
self.root_ids.is_empty()
|
||||
}
|
||||
|
||||
/// Test whether the forest conains a given DefId.
|
||||
/// Test whether the forest contains a given DefId.
|
||||
pub fn contains(&self,
|
||||
tcx: TyCtxt<'a, 'gcx, 'tcx>,
|
||||
id: DefId) -> bool
|
||||
|
|
|
@ -125,7 +125,7 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
|
|||
|
||||
/// If possible, this pushes a global path resolving to `external_def_id` that is visible
|
||||
/// from at least one local module and returns true. If the crate defining `external_def_id` is
|
||||
/// declared with an `extern crate`, the path is guarenteed to use the `extern crate`.
|
||||
/// declared with an `extern crate`, the path is guaranteed to use the `extern crate`.
|
||||
pub fn try_push_visible_item_path<T>(self, buffer: &mut T, external_def_id: DefId) -> bool
|
||||
where T: ItemPathBuffer
|
||||
{
|
||||
|
|
|
@ -587,7 +587,7 @@ macro_rules! define_maps {
|
|||
}
|
||||
|
||||
// FIXME(eddyb) Get more valid Span's on queries.
|
||||
// def_span guard is necesary to prevent a recursive loop,
|
||||
// def_span guard is necessary to prevent a recursive loop,
|
||||
// default_span calls def_span query internally.
|
||||
if span == DUMMY_SP && stringify!($name) != "def_span" {
|
||||
span = key.default_span(tcx)
|
||||
|
|
|
@ -224,7 +224,7 @@ pub trait MemoizationMap {
|
|||
type Key: Clone;
|
||||
type Value: Clone;
|
||||
|
||||
/// If `key` is present in the map, return the valuee,
|
||||
/// If `key` is present in the map, return the value,
|
||||
/// otherwise invoke `op` and store the value in the map.
|
||||
///
|
||||
/// NB: if the receiver is a `DepTrackingMap`, special care is
|
||||
|
|
|
@ -472,7 +472,7 @@ impl<'a, 'tcx> CheckLoanCtxt<'a, 'tcx> {
|
|||
|
||||
if new_loan.span == old_loan.span {
|
||||
// Both borrows are happening in the same place
|
||||
// Meaning the borrow is occuring in a loop
|
||||
// Meaning the borrow is occurring in a loop
|
||||
err.span_label(
|
||||
new_loan.span,
|
||||
format!("mutable borrow starts here in previous \
|
||||
|
|
|
@ -106,7 +106,7 @@ impl<'a, 'tcx> ConstContext<'a, 'tcx> {
|
|||
}
|
||||
|
||||
/// Evaluate a constant expression in a context where the expression isn't
|
||||
/// guaranteed to be evaluatable.
|
||||
/// guaranteed to be evaluable.
|
||||
pub fn eval(&self, e: &Expr) -> EvalResult<'tcx> {
|
||||
if self.tables.tainted_by_errors {
|
||||
signal!(e, TypeckError);
|
||||
|
|
|
@ -974,7 +974,7 @@ pub fn phase_3_run_analysis_passes<'tcx, F, R>(sess: &'tcx Session,
|
|||
passes.push_pass(MIR_CONST, mir::transform::type_check::TypeckMir);
|
||||
passes.push_pass(MIR_CONST, mir::transform::rustc_peek::SanityCheck);
|
||||
|
||||
// We compute "constant qualifications" betwen MIR_CONST and MIR_VALIDATED.
|
||||
// We compute "constant qualifications" between MIR_CONST and MIR_VALIDATED.
|
||||
|
||||
// What we need to run borrowck etc.
|
||||
passes.push_pass(MIR_VALIDATED, mir::transform::qualify_consts::QualifyAndPromoteConstants);
|
||||
|
|
|
@ -113,7 +113,7 @@ pub struct Scope<'tcx> {
|
|||
/// for unwinding, for several reasons:
|
||||
/// * clang doesn't emit llvm.lifetime.end for C++ unwinding
|
||||
/// * LLVM's memory dependency analysis can't handle it atm
|
||||
/// * pollutting the cleanup MIR with StorageDead creates
|
||||
/// * polluting the cleanup MIR with StorageDead creates
|
||||
/// landing pads even though there's no actual destructors
|
||||
/// * freeing up stack space has no effect during unwinding
|
||||
needs_cleanup: bool,
|
||||
|
|
|
@ -333,11 +333,11 @@ pub trait BitDenotation {
|
|||
/// basic block) according to the effects of evaluating statement.
|
||||
///
|
||||
/// This is used, in particular, for building up the
|
||||
/// "transfer-function" represnting the overall-effect of the
|
||||
/// "transfer-function" representing the overall-effect of the
|
||||
/// block, represented via GEN and KILL sets.
|
||||
///
|
||||
/// The statement is identified as `bb_data[idx_stmt]`, where
|
||||
/// `bb_data` is the sequence of statements identifed by `bb` in
|
||||
/// `bb_data` is the sequence of statements identified by `bb` in
|
||||
/// the MIR.
|
||||
fn statement_effect(&self,
|
||||
sets: &mut BlockSets<Self::Idx>,
|
||||
|
@ -349,7 +349,7 @@ pub trait BitDenotation {
|
|||
/// the terminator.
|
||||
///
|
||||
/// This is used, in particular, for building up the
|
||||
/// "transfer-function" represnting the overall-effect of the
|
||||
/// "transfer-function" representing the overall-effect of the
|
||||
/// block, represented via GEN and KILL sets.
|
||||
///
|
||||
/// The effects applied here cannot depend on which branch the
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
//! This pass erases all early-bound regions from the types occuring in the MIR.
|
||||
//! This pass erases all early-bound regions from the types occurring in the MIR.
|
||||
//! We want to do this once just before trans, so trans does not have to take
|
||||
//! care erasing regions all over the place.
|
||||
//! NOTE: We do NOT erase regions of statements that are relevant for
|
||||
|
|
|
@ -1621,7 +1621,7 @@ impl<'a> Resolver<'a> {
|
|||
return Some(module.parent.unwrap());
|
||||
}
|
||||
|
||||
let mut module_expansion = module.expansion.modern(); // for backward compatability
|
||||
let mut module_expansion = module.expansion.modern(); // for backward compatibility
|
||||
while let Some(parent) = module.parent {
|
||||
let parent_expansion = parent.expansion.modern();
|
||||
if module_expansion.is_descendant_of(parent_expansion) &&
|
||||
|
|
|
@ -109,7 +109,7 @@ impl<'b, O: DumpOutput + 'b> JsonDumper<O> {
|
|||
}
|
||||
if data.kind == DefKind::Mod && data.span.file_name.to_str().unwrap() != data.value {
|
||||
// If the module is an out-of-line defintion, then we'll make the
|
||||
// defintion the first character in the module's file and turn the
|
||||
// definition the first character in the module's file and turn the
|
||||
// the declaration into a reference to it.
|
||||
let rf = Ref {
|
||||
kind: RefKind::Mod,
|
||||
|
|
|
@ -387,7 +387,7 @@ impl Sig for ast::Item {
|
|||
|
||||
sig.text.push('(');
|
||||
for i in &decl.inputs {
|
||||
// FIXME shoudl descend into patterns to add defs.
|
||||
// FIXME should descend into patterns to add defs.
|
||||
sig.text.push_str(&pprust::pat_to_string(&i.pat));
|
||||
sig.text.push_str(": ");
|
||||
let nested = i.ty.make(offset + sig.text.len(), Some(i.id), scx)?;
|
||||
|
@ -922,7 +922,7 @@ fn make_method_signature(id: NodeId,
|
|||
|
||||
sig.text.push('(');
|
||||
for i in &m.decl.inputs {
|
||||
// FIXME shoudl descend into patterns to add defs.
|
||||
// FIXME should descend into patterns to add defs.
|
||||
sig.text.push_str(&pprust::pat_to_string(&i.pat));
|
||||
sig.text.push_str(": ");
|
||||
let nested = i.ty.make(sig.text.len(), Some(i.id), scx)?;
|
||||
|
|
|
@ -488,7 +488,7 @@ impl Lifetime {
|
|||
// on), and `ptr` is nonzero-sized, then extracts the size of `ptr`
|
||||
// and the intrinsic for `lt` and passes them to `emit`, which is in
|
||||
// charge of generating code to call the passed intrinsic on whatever
|
||||
// block of generated code is targetted for the intrinsic.
|
||||
// block of generated code is targeted for the intrinsic.
|
||||
//
|
||||
// If LLVM lifetime intrinsic support is disabled (i.e. optimizations
|
||||
// off) or `ptr` is zero-sized, then no-op (does not call `emit`).
|
||||
|
|
|
@ -36,7 +36,7 @@ pub fn push_debuginfo_type_name<'a, 'tcx>(cx: &CrateContext<'a, 'tcx>,
|
|||
t: Ty<'tcx>,
|
||||
qualified: bool,
|
||||
output: &mut String) {
|
||||
// When targeting MSVC, emit C++ style type names for compatability with
|
||||
// When targeting MSVC, emit C++ style type names for compatibility with
|
||||
// .natvis visualizers (and perhaps other existing native debuggers?)
|
||||
let cpp_like_names = cx.sess().target.target.options.is_like_msvc;
|
||||
|
||||
|
|
|
@ -135,7 +135,7 @@ impl<'a, 'tcx> MirContext<'a, 'tcx> {
|
|||
(scope, source_info.span)
|
||||
} else {
|
||||
// Walk up the macro expansion chain until we reach a non-expanded span.
|
||||
// We also stop at the function body level because no line stepping can occurr
|
||||
// We also stop at the function body level because no line stepping can occur
|
||||
// at the level above that.
|
||||
let mut span = source_info.span;
|
||||
while span.ctxt != NO_EXPANSION && span.ctxt != self.mir.span.ctxt {
|
||||
|
|
|
@ -219,7 +219,7 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
|
|||
/// `lookup_method_in_trait` is used for overloaded operators.
|
||||
/// It does a very narrow slice of what the normal probe/confirm path does.
|
||||
/// In particular, it doesn't really do any probing: it simply constructs
|
||||
/// an obligation for aparticular trait with the given self-type and checks
|
||||
/// an obligation for a particular trait with the given self-type and checks
|
||||
/// whether that trait is implemented.
|
||||
///
|
||||
/// FIXME(#18741) -- It seems likely that we can consolidate some of this
|
||||
|
|
|
@ -529,7 +529,7 @@ pub struct FnCtxt<'a, 'gcx: 'a+'tcx, 'tcx: 'a> {
|
|||
/// `foo(return)`; we warn on the `foo()` expression. (We then
|
||||
/// update the flag to `WarnedAlways` to suppress duplicate
|
||||
/// reports.) Similarly, if we traverse to a fresh statement (or
|
||||
/// tail expression) from a `Always` setting, we will isssue a
|
||||
/// tail expression) from a `Always` setting, we will issue a
|
||||
/// warning. This corresponds to something like `{return;
|
||||
/// foo();}` or `{return; 22}`, where we would warn on the
|
||||
/// `foo()` or `22`.
|
||||
|
@ -538,7 +538,7 @@ pub struct FnCtxt<'a, 'gcx: 'a+'tcx, 'tcx: 'a> {
|
|||
/// (including the "return slot") of type `!`. This is allowed
|
||||
/// if **either** the type of value being assigned is `!`, which
|
||||
/// means the current code is dead, **or** the expression's
|
||||
/// divering flag is true, which means that a divering value was
|
||||
/// diverging flag is true, which means that a diverging value was
|
||||
/// wrapped (e.g., `let x: ! = foo(return)`).
|
||||
///
|
||||
/// To repeat the last point: an expression represents dead-code
|
||||
|
@ -1895,7 +1895,7 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
|
|||
value.fold_with(&mut BottomUpFolder { tcx: self.tcx, fldop: |ty| {
|
||||
if let ty::TyAnon(def_id, substs) = ty.sty {
|
||||
// Use the same type variable if the exact same TyAnon appears more
|
||||
// than once in the return type (e.g. if it's pased to a type alias).
|
||||
// than once in the return type (e.g. if it's passed to a type alias).
|
||||
let id = self.tcx.hir.as_local_node_id(def_id).unwrap();
|
||||
if let Some(ty_var) = self.anon_types.borrow().get(&id) {
|
||||
return ty_var;
|
||||
|
@ -4244,7 +4244,7 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
|
|||
}
|
||||
|
||||
/// Given a `NodeId`, return the `FnDecl` of the method it is enclosed by and whether a
|
||||
/// suggetion can be made, `None` otherwise.
|
||||
/// suggestion can be made, `None` otherwise.
|
||||
pub fn get_fn_decl(&self, blk_id: ast::NodeId) -> Option<(hir::FnDecl, bool)> {
|
||||
// Get enclosing Fn, if it is a function or a trait method, unless there's a `loop` or
|
||||
// `while` before reaching it, as block tail returns are not available in them.
|
||||
|
@ -4312,7 +4312,7 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
|
|||
/// ```
|
||||
///
|
||||
/// This routine checks if the return expression in a block would make sense on its own as a
|
||||
/// statement and the return type has been left as defaultor has been specified as `()`. If so,
|
||||
/// statement and the return type has been left as default or has been specified as `()`. If so,
|
||||
/// it suggests adding a semicolon.
|
||||
fn suggest_missing_semicolon(&self,
|
||||
err: &mut DiagnosticBuilder<'tcx>,
|
||||
|
|
|
@ -255,7 +255,7 @@ impl<'a, 'gcx> CheckTypeWellFormedVisitor<'a, 'gcx> {
|
|||
// We want to ensure:
|
||||
//
|
||||
// 1) that there are no items contained within
|
||||
// the trait defintion
|
||||
// the trait definition
|
||||
//
|
||||
// 2) that the definition doesn't violate the no-super trait rule
|
||||
// for auto traits.
|
||||
|
|
|
@ -657,7 +657,7 @@ impl OpenOptions {
|
|||
/// This function will return an error under a number of different
|
||||
/// circumstances. Some of these error conditions are listed here, together
|
||||
/// with their [`ErrorKind`]. The mapping to [`ErrorKind`]s is not part of
|
||||
/// the compatiblity contract of the function, especially the `Other` kind
|
||||
/// the compatibility contract of the function, especially the `Other` kind
|
||||
/// might change to more specific kinds in the future.
|
||||
///
|
||||
/// * [`NotFound`]: The specified file does not exist and neither `create`
|
||||
|
|
|
@ -351,7 +351,7 @@ impl TcpStream {
|
|||
self.0.write_timeout()
|
||||
}
|
||||
|
||||
/// Receives data on the socket from the remote adress to which it is
|
||||
/// Receives data on the socket from the remote address to which it is
|
||||
/// connected, without removing that data from the queue. On success,
|
||||
/// returns the number of bytes peeked.
|
||||
///
|
||||
|
|
|
@ -622,7 +622,7 @@ impl UdpSocket {
|
|||
self.0.recv(buf)
|
||||
}
|
||||
|
||||
/// Receives data on the socket from the remote adress to which it is
|
||||
/// Receives data on the socket from the remote address to which it is
|
||||
/// connected, without removing that data from the queue. On success,
|
||||
/// returns the number of bytes peeked.
|
||||
///
|
||||
|
|
|
@ -37,7 +37,7 @@ pub use panicking::{take_hook, set_hook, PanicInfo, Location};
|
|||
/// In Rust a function can "return" early if it either panics or calls a
|
||||
/// function which transitively panics. This sort of control flow is not always
|
||||
/// anticipated, and has the possibility of causing subtle bugs through a
|
||||
/// combination of two criticial components:
|
||||
/// combination of two critical components:
|
||||
///
|
||||
/// 1. A data structure is in a temporarily invalid state when the thread
|
||||
/// panics.
|
||||
|
|
|
@ -171,7 +171,7 @@ pub fn take_hook() -> Box<Fn(&PanicInfo) + 'static + Sync + Send> {
|
|||
/// use std::panic;
|
||||
///
|
||||
/// panic::set_hook(Box::new(|panic_info| {
|
||||
/// println!("panic occured: {:?}", panic_info.payload().downcast_ref::<&str>().unwrap());
|
||||
/// println!("panic occurred: {:?}", panic_info.payload().downcast_ref::<&str>().unwrap());
|
||||
/// }));
|
||||
///
|
||||
/// panic!("Normal panic");
|
||||
|
@ -196,7 +196,7 @@ impl<'a> PanicInfo<'a> {
|
|||
/// use std::panic;
|
||||
///
|
||||
/// panic::set_hook(Box::new(|panic_info| {
|
||||
/// println!("panic occured: {:?}", panic_info.payload().downcast_ref::<&str>().unwrap());
|
||||
/// println!("panic occurred: {:?}", panic_info.payload().downcast_ref::<&str>().unwrap());
|
||||
/// }));
|
||||
///
|
||||
/// panic!("Normal panic");
|
||||
|
@ -221,9 +221,10 @@ impl<'a> PanicInfo<'a> {
|
|||
///
|
||||
/// panic::set_hook(Box::new(|panic_info| {
|
||||
/// if let Some(location) = panic_info.location() {
|
||||
/// println!("panic occured in file '{}' at line {}", location.file(), location.line());
|
||||
/// println!("panic occurred in file '{}' at line {}", location.file(),
|
||||
/// location.line());
|
||||
/// } else {
|
||||
/// println!("panic occured but can't get location information...");
|
||||
/// println!("panic occurred but can't get location information...");
|
||||
/// }
|
||||
/// }));
|
||||
///
|
||||
|
@ -249,9 +250,9 @@ impl<'a> PanicInfo<'a> {
|
|||
///
|
||||
/// panic::set_hook(Box::new(|panic_info| {
|
||||
/// if let Some(location) = panic_info.location() {
|
||||
/// println!("panic occured in file '{}' at line {}", location.file(), location.line());
|
||||
/// println!("panic occurred in file '{}' at line {}", location.file(), location.line());
|
||||
/// } else {
|
||||
/// println!("panic occured but can't get location information...");
|
||||
/// println!("panic occurred but can't get location information...");
|
||||
/// }
|
||||
/// }));
|
||||
///
|
||||
|
@ -275,9 +276,9 @@ impl<'a> Location<'a> {
|
|||
///
|
||||
/// panic::set_hook(Box::new(|panic_info| {
|
||||
/// if let Some(location) = panic_info.location() {
|
||||
/// println!("panic occured in file '{}'", location.file());
|
||||
/// println!("panic occurred in file '{}'", location.file());
|
||||
/// } else {
|
||||
/// println!("panic occured but can't get location information...");
|
||||
/// println!("panic occurred but can't get location information...");
|
||||
/// }
|
||||
/// }));
|
||||
///
|
||||
|
@ -297,9 +298,9 @@ impl<'a> Location<'a> {
|
|||
///
|
||||
/// panic::set_hook(Box::new(|panic_info| {
|
||||
/// if let Some(location) = panic_info.location() {
|
||||
/// println!("panic occured at line {}", location.line());
|
||||
/// println!("panic occurred at line {}", location.line());
|
||||
/// } else {
|
||||
/// println!("panic occured but can't get location information...");
|
||||
/// println!("panic occurred but can't get location information...");
|
||||
/// }
|
||||
/// }));
|
||||
///
|
||||
|
@ -320,9 +321,9 @@ impl<'a> Location<'a> {
|
|||
///
|
||||
/// panic::set_hook(Box::new(|panic_info| {
|
||||
/// if let Some(location) = panic_info.location() {
|
||||
/// println!("panic occured at column {}", location.column());
|
||||
/// println!("panic occurred at column {}", location.column());
|
||||
/// } else {
|
||||
/// println!("panic occured but can't get location information...");
|
||||
/// println!("panic occurred but can't get location information...");
|
||||
/// }
|
||||
/// }));
|
||||
///
|
||||
|
|
|
@ -906,7 +906,7 @@ mod prim_ref { }
|
|||
/// These markers can be combined, so `unsafe extern "stdcall" fn()` is a valid type.
|
||||
///
|
||||
/// Like references in rust, function pointers are assumed to not be null, so if you want to pass a
|
||||
/// function pointer over FFI and be able to accomodate null pointers, make your type
|
||||
/// function pointer over FFI and be able to accommodate null pointers, make your type
|
||||
/// `Option<fn()>` with your required signature.
|
||||
///
|
||||
/// Function pointers implement the following traits:
|
||||
|
|
|
@ -121,7 +121,7 @@ pub trait OpenOptionsExt {
|
|||
#[stable(feature = "fs_ext", since = "1.1.0")]
|
||||
fn mode(&mut self, mode: u32) -> &mut Self;
|
||||
|
||||
/// Pass custom flags to the `flags` agument of `open`.
|
||||
/// Pass custom flags to the `flags` argument of `open`.
|
||||
///
|
||||
/// The bits that define the access mode are masked out with `O_ACCMODE`, to
|
||||
/// ensure they do not interfere with the access mode set by Rusts options.
|
||||
|
|
|
@ -47,7 +47,7 @@ pub trait CommandExt {
|
|||
/// # Notes
|
||||
///
|
||||
/// This closure will be run in the context of the child process after a
|
||||
/// `fork`. This primarily means that any modificatons made to memory on
|
||||
/// `fork`. This primarily means that any modifications made to memory on
|
||||
/// behalf of this closure will **not** be visible to the parent process.
|
||||
/// This is often a very constrained environment where normal operations
|
||||
/// like `malloc` or acquiring a mutex are not guaranteed to work (due to
|
||||
|
|
|
@ -46,7 +46,7 @@ pub trait FileExt {
|
|||
///
|
||||
/// The current file cursor is not affected by this function.
|
||||
///
|
||||
/// When writing beyond the end of the file, the file is appropiately
|
||||
/// When writing beyond the end of the file, the file is appropriately
|
||||
/// extended and the intermediate bytes are initialized with the value 0.
|
||||
///
|
||||
/// Note that similar to `File::write`, it is not an error to return a
|
||||
|
@ -168,7 +168,7 @@ pub trait OpenOptionsExt {
|
|||
#[stable(feature = "fs_ext", since = "1.1.0")]
|
||||
fn mode(&mut self, mode: u32) -> &mut Self;
|
||||
|
||||
/// Pass custom flags to the `flags` agument of `open`.
|
||||
/// Pass custom flags to the `flags` argument of `open`.
|
||||
///
|
||||
/// The bits that define the access mode are masked out with `O_ACCMODE`, to
|
||||
/// ensure they do not interfere with the access mode set by Rusts options.
|
||||
|
|
|
@ -327,7 +327,7 @@ impl UnixStream {
|
|||
///
|
||||
/// The returned `UnixStream` is a reference to the same stream that this
|
||||
/// object references. Both handles will read and write the same stream of
|
||||
/// data, and options set on one stream will be propogated to the other
|
||||
/// data, and options set on one stream will be propagated to the other
|
||||
/// stream.
|
||||
///
|
||||
/// # Examples
|
||||
|
|
|
@ -47,7 +47,7 @@ pub trait CommandExt {
|
|||
/// # Notes
|
||||
///
|
||||
/// This closure will be run in the context of the child process after a
|
||||
/// `fork`. This primarily means that any modificatons made to memory on
|
||||
/// `fork`. This primarily means that any modifications made to memory on
|
||||
/// behalf of this closure will **not** be visible to the parent process.
|
||||
/// This is often a very constrained environment where normal operations
|
||||
/// like `malloc` or acquiring a mutex are not guaranteed to work (due to
|
||||
|
|
|
@ -66,7 +66,7 @@ pub trait FileExt {
|
|||
/// from the current cursor. The current cursor **is** affected by this
|
||||
/// function, it is set to the end of the write.
|
||||
///
|
||||
/// When writing beyond the end of the file, the file is appropiately
|
||||
/// When writing beyond the end of the file, the file is appropriately
|
||||
/// extended and the intermediate bytes are left uninitialized.
|
||||
///
|
||||
/// Note that similar to `File::write`, it is not an error to return a
|
||||
|
|
|
@ -563,8 +563,8 @@ pub enum PatKind {
|
|||
TupleStruct(Path, Vec<P<Pat>>, Option<usize>),
|
||||
|
||||
/// A possibly qualified path pattern.
|
||||
/// Unquailfied path patterns `A::B::C` can legally refer to variants, structs, constants
|
||||
/// or associated constants. Quailfied path patterns `<A>::B::C`/`<A as Trait>::B::C` can
|
||||
/// Unqualified path patterns `A::B::C` can legally refer to variants, structs, constants
|
||||
/// or associated constants. Qualified path patterns `<A>::B::C`/`<A as Trait>::B::C` can
|
||||
/// only legally refer to associated constants.
|
||||
Path(Option<QSelf>, Path),
|
||||
|
||||
|
@ -1838,7 +1838,7 @@ pub struct Item {
|
|||
|
||||
#[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Debug)]
|
||||
pub enum ItemKind {
|
||||
/// An`extern crate` item, with optional original crate name.
|
||||
/// An `extern crate` item, with optional original crate name.
|
||||
///
|
||||
/// E.g. `extern crate foo` or `extern crate foo_bar as foo`
|
||||
ExternCrate(Option<Name>),
|
||||
|
|
|
@ -761,7 +761,7 @@ mod tests {
|
|||
}
|
||||
|
||||
/// Given a string like " ~~~~~~~~~~~~ ", produces a span
|
||||
/// coverting that range. The idea is that the string has the same
|
||||
/// converting that range. The idea is that the string has the same
|
||||
/// length as the input, and we uncover the byte positions. Note
|
||||
/// that this can span lines and so on.
|
||||
fn span_from_selection(input: &str, selection: &str) -> Span {
|
||||
|
@ -771,7 +771,7 @@ mod tests {
|
|||
Span { lo: BytePos(left_index), hi: BytePos(right_index + 1), ctxt: NO_EXPANSION }
|
||||
}
|
||||
|
||||
/// Test span_to_snippet and span_to_lines for a span coverting 3
|
||||
/// Test span_to_snippet and span_to_lines for a span converting 3
|
||||
/// lines in the middle of a file.
|
||||
#[test]
|
||||
fn span_to_snippet_and_lines_spanning_multiple_lines() {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue