提交 aa63f54e 编写于 作者: S Steve Klabnik

Rollup merge of #33438 - birkenfeld:dup-words, r=steveklabnik

Fix some some duplicate words.
...@@ -54,7 +54,7 @@ pub unsafe fn setup() { ...@@ -54,7 +54,7 @@ pub unsafe fn setup() {
// Indicate that when all handles to the job object are gone that all // Indicate that when all handles to the job object are gone that all
// process in the object should be killed. Note that this includes our // process in the object should be killed. Note that this includes our
// entire process tree by default because we've added ourselves and and our // entire process tree by default because we've added ourselves and our
// children will reside in the job by default. // children will reside in the job by default.
let mut info = mem::zeroed::<JOBOBJECT_EXTENDED_LIMIT_INFORMATION>(); let mut info = mem::zeroed::<JOBOBJECT_EXTENDED_LIMIT_INFORMATION>();
info.BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE; info.BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE;
......
...@@ -1355,7 +1355,7 @@ pub fn check_nightly_options(matches: &getopts::Matches, flags: &[RustcOptGroup] ...@@ -1355,7 +1355,7 @@ pub fn check_nightly_options(matches: &getopts::Matches, flags: &[RustcOptGroup]
early_error(ErrorOutputType::default(), &msg); early_error(ErrorOutputType::default(), &msg);
} }
OptionStability::UnstableButNotReally => { OptionStability::UnstableButNotReally => {
let msg = format!("the option `{}` is is unstable and should \ let msg = format!("the option `{}` is unstable and should \
only be used on the nightly compiler, but \ only be used on the nightly compiler, but \
it is currently accepted for backwards \ it is currently accepted for backwards \
compatibility; this will soon change, \ compatibility; this will soon change, \
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
pub enum ProjectionMode { pub enum ProjectionMode {
/// FIXME (#32205) /// FIXME (#32205)
/// At coherence-checking time, we're still constructing the /// At coherence-checking time, we're still constructing the
/// specialization graph, and thus we only project project /// specialization graph, and thus we only project
/// non-`default` associated types that are defined directly in /// non-`default` associated types that are defined directly in
/// the applicable impl. (This behavior should be improved over /// the applicable impl. (This behavior should be improved over
/// time, to allow for successful projections modulo cycles /// time, to allow for successful projections modulo cycles
......
...@@ -176,7 +176,7 @@ pub fn record_local_impl(&self, ...@@ -176,7 +176,7 @@ pub fn record_local_impl(&self,
/// Records a trait-to-implementation mapping for a non-local impl. /// Records a trait-to-implementation mapping for a non-local impl.
/// ///
/// The `parent_impl` is the immediately-less-specialized impl, or the /// The `parent_impl` is the immediately-less-specialized impl, or the
/// trait's def ID if the impl is is not a specialization -- information that /// trait's def ID if the impl is not a specialization -- information that
/// should be pulled from the metadata. /// should be pulled from the metadata.
pub fn record_remote_impl(&self, pub fn record_remote_impl(&self,
tcx: &TyCtxt<'tcx>, tcx: &TyCtxt<'tcx>,
......
...@@ -272,7 +272,7 @@ fn compute_trait_ref(&mut self, trait_ref: &ty::TraitRef<'tcx>) { ...@@ -272,7 +272,7 @@ fn compute_trait_ref(&mut self, trait_ref: &ty::TraitRef<'tcx>) {
/// into `self.out`. /// into `self.out`.
fn compute_projection(&mut self, data: ty::ProjectionTy<'tcx>) { fn compute_projection(&mut self, data: ty::ProjectionTy<'tcx>) {
// A projection is well-formed if (a) the trait ref itself is // A projection is well-formed if (a) the trait ref itself is
// WF WF and (b) the trait-ref holds. (It may also be // WF and (b) the trait-ref holds. (It may also be
// normalizable and be WF that way.) // normalizable and be WF that way.)
self.compute_trait_ref(&data.trait_ref); self.compute_trait_ref(&data.trait_ref);
......
...@@ -1327,7 +1327,7 @@ fn generate_filter_fn<'a, 'tcx>(fcx: &FunctionContext<'a, 'tcx>, ...@@ -1327,7 +1327,7 @@ fn generate_filter_fn<'a, 'tcx>(fcx: &FunctionContext<'a, 'tcx>,
// %ret = call i32 @the_real_filter_function(%ehptrs, %arg) // %ret = call i32 @the_real_filter_function(%ehptrs, %arg)
// ret i32 %ret // ret i32 %ret
// //
// The recoverfp intrinsic is used to recover the frame frame pointer of the // The recoverfp intrinsic is used to recover the frame pointer of the
// `rust_try_fn` function, which is then in turn passed to the // `rust_try_fn` function, which is then in turn passed to the
// `localrecover` intrinsic (pairing with the `localescape` intrinsic // `localrecover` intrinsic (pairing with the `localescape` intrinsic
// mentioned above). Putting all this together means that we now have a // mentioned above). Putting all this together means that we now have a
......
...@@ -371,7 +371,7 @@ pub fn is_unicast_site_local(&self) -> bool { ...@@ -371,7 +371,7 @@ pub fn is_unicast_site_local(&self) -> bool {
} }
/// Returns true if this is an address reserved for documentation /// Returns true if this is an address reserved for documentation
/// This is defined to be 2001:db8::/32 in RFC RFC 3849 /// This is defined to be 2001:db8::/32 in RFC 3849.
pub fn is_documentation(&self) -> bool { pub fn is_documentation(&self) -> bool {
(self.segments()[0] == 0x2001) && (self.segments()[1] == 0xdb8) (self.segments()[0] == 0x2001) && (self.segments()[1] == 0xdb8)
} }
......
...@@ -147,7 +147,7 @@ pub fn env(&mut self, key: &OsStr, val: &OsStr) { ...@@ -147,7 +147,7 @@ pub fn env(&mut self, key: &OsStr, val: &OsStr) {
let new_key = pair_to_key(key, val, &mut self.saw_nul); let new_key = pair_to_key(key, val, &mut self.saw_nul);
let (map, envp) = self.init_env_map(); let (map, envp) = self.init_env_map();
// If `key` is already present then we we just update `envp` in place // If `key` is already present then we just update `envp` in place
// (and store the owned value), but if it's not there we override the // (and store the owned value), but if it's not there we override the
// trailing NULL pointer, add a new NULL pointer, and store where we // trailing NULL pointer, add a new NULL pointer, and store where we
// were located. // were located.
......
...@@ -27,7 +27,7 @@ fn main() { ...@@ -27,7 +27,7 @@ fn main() {
//~ TRANS_ITEM fn cgu_extern_closures::inlined_fn_generic[0]::{{closure}}[0]<i32> //~ TRANS_ITEM fn cgu_extern_closures::inlined_fn_generic[0]::{{closure}}[0]<i32>
let _ = cgu_extern_closures::inlined_fn_generic(3, 4, 5i32); let _ = cgu_extern_closures::inlined_fn_generic(3, 4, 5i32);
// Nothing should be generated for this call, we just link to the instance instance // Nothing should be generated for this call, we just link to the instance
// in the extern crate. // in the extern crate.
let _ = cgu_extern_closures::non_inlined_fn(6, 7); let _ = cgu_extern_closures::non_inlined_fn(6, 7);
} }
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
// except according to those terms. // except according to those terms.
// Test a corner case of LUB coercion. In this case, one arm of the // Test a corner case of LUB coercion. In this case, one arm of the
// match requires a deref coercion and other other doesn't, and there // match requires a deref coercion and the other doesn't, and there
// is an extra `&` on the `rc`. We want to be sure that the lifetime // is an extra `&` on the `rc`. We want to be sure that the lifetime
// assigned to this `&rc` value is not `'a` but something smaller. In // assigned to this `&rc` value is not `'a` but something smaller. In
// other words, the type from `rc` is `&'a Rc<String>` and the type // other words, the type from `rc` is `&'a Rc<String>` and the type
......
...@@ -110,7 +110,7 @@ fn walk(cache: &mut Cache, ...@@ -110,7 +110,7 @@ fn walk(cache: &mut Cache,
if let Some(pretty_path) = pretty_path { if let Some(pretty_path) = pretty_path {
let entry = cache.get_mut(&pretty_path).unwrap(); let entry = cache.get_mut(&pretty_path).unwrap();
// we don't need the source anymore, // we don't need the source anymore,
// so drop to to reduce memory-usage // so drop to reduce memory-usage
entry.source = String::new(); entry.source = String::new();
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册